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

annotate rust/hg-core/src/revlog/mod.rs @ 52186:e6a44bc91bc2 stable

rust-update: make `update_from_null` respect `worker.numcpu` config option This was overlooked in the original series. This is important for tests (because we run many at once), and for the occasional end user that wants to keep their CPU usage in check. A future series should clean up this `worker` parameter tunelling business by rewriting the config in Rust, but doing so on stable would be a very bad idea.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Tue, 05 Nov 2024 15:21:09 +0100
parents	8b7123c8947b
children	0744248cc541

rev	line source
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1 // Copyright 2018-2023 Georges Racinet <georges.racinet@octobus.net>
44005 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
44143 7f86426fdd2c rust-node: binary Node ID and conversion utilities Georges Racinet <georges.racinet@octobus.net> parents: 44142 diff changeset	8 pub mod node;
44142 63db6657d280 rust-nodemap: building blocks for nodetree structures Georges Racinet <georges.racinet@octobus.net> parents: 44088 diff changeset	9 pub mod nodemap;
46090 9eb07ab3f2d4 rhg: use persistent nodemap when available Simon Sapin <simon-commits@exyr.org> parents: 45539 diff changeset	10 mod nodemap_docket;
45539 aebc976fd7d5 hg-core: add path_encode Antoine Cezar <antoine.cezar@octobus.net> parents: 45533 diff changeset	11 pub mod path_encode;
46431 645ee7225fab rust: Make NodePrefix allocation-free and Copy, remove NodePrefixRef Simon Sapin <simon.sapin@octobus.net> parents: 46428 diff changeset	12 pub use node::{FromHexError, Node, NodePrefix};
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: 45526 diff changeset	13 pub mod changelog;
47961 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: 46821 diff changeset	14 pub mod filelog;
45526 26c53ee51c68 hg-core: Add a limited read only `revlog` implementation Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	15 pub mod index;
45533 89ac95bd4993 hg-core: add `Manifest` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: 45532 diff changeset	16 pub mod manifest;
45526 26c53ee51c68 hg-core: Add a limited read only `revlog` implementation Antoine Cezar <antoine.cezar@octobus.net> parents: 44973 diff changeset	17 pub mod patch;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	18
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	19 use std::borrow::Cow;
51861 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	20 use std::collections::HashSet;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	21 use std::io::Read;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	22 use std::ops::Deref;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	23 use std::path::Path;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	24
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	25 use flate2::read::ZlibDecoder;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	26 use sha1::{Digest, Sha1};
50503 74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	27 use std::cell::RefCell;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	28 use zstd;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	29
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	30 use self::node::{NODE_BYTES_LENGTH, NULL_NODE};
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	31 use self::nodemap_docket::NodeMapDocket;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	32 use super::index::Index;
51442 d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	33 use super::index::INDEX_ENTRY_SIZE;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	34 use super::nodemap::{NodeMap, NodeMapError};
51861 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	35 use crate::config::{Config, ResourceProfileValue};
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	36 use crate::errors::HgError;
51861 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	37 use crate::exit_codes;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	38 use crate::requirements::{
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	39 GENERALDELTA_REQUIREMENT, NARROW_REQUIREMENT, SPARSEREVLOG_REQUIREMENT,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	40 };
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	41 use crate::vfs::VfsImpl;
44142 63db6657d280 rust-nodemap: building blocks for nodetree structures Georges Racinet <georges.racinet@octobus.net> parents: 44088 diff changeset	42
44005 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
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	45 pub type BaseRevision = i32;
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	46
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	47 /// Mercurial revision numbers
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 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: 50975 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: 50975 diff changeset	50 /// valid for a given index (i.e. in bounds).
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	51 #[derive(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	52 Debug,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	53 derive_more::Display,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	54 Clone,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	55 Copy,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	56 Hash,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	57 PartialEq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	58 Eq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	59 PartialOrd,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	60 Ord,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	61 )]
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	62 pub struct Revision(pub BaseRevision);
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	63
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	64 impl format_bytes::DisplayBytes for Revision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	65 fn display_bytes(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	66 &self,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	67 output: &mut dyn std::io::Write,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	68 ) -> std::io::Result<()> {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	69 self.0.display_bytes(output)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	70 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	71 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	72
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	73 /// Unchecked Mercurial revision numbers.
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	74 ///
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 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: 50975 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: 50975 diff changeset	77 /// the appropriate index object.
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	78 #[derive(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	79 Debug,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	80 derive_more::Display,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	81 Clone,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	82 Copy,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	83 Hash,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	84 PartialEq,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	85 Eq,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	86 PartialOrd,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	87 Ord,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	88 )]
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	89 pub struct UncheckedRevision(pub BaseRevision);
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	90
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	91 impl format_bytes::DisplayBytes for UncheckedRevision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	92 fn display_bytes(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	93 &self,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	94 output: &mut dyn std::io::Write,
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	95 ) -> std::io::Result<()> {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	96 self.0.display_bytes(output)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	97 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	98 }
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	99
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	100 impl From<Revision> for UncheckedRevision {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	101 fn from(value: Revision) -> Self {
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	102 Self(value.0)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	103 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	104 }
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	105
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	106 impl From<BaseRevision> for UncheckedRevision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	107 fn from(value: BaseRevision) -> Self {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	108 Self(value)
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	109 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	110 }
44005 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: 44005 diff changeset	115 /// to be smaller than all existing revisions.
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	116 pub const NULL_REVISION: Revision = Revision(-1);
44005 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`
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	122 #[allow(clippy::unreadable_literal)]
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 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: 50973 diff changeset	124 UncheckedRevision(0x7fffffff);
44005 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: 46431 diff changeset	126 pub const WORKING_DIRECTORY_HEX: &str =
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46431 diff changeset	127 "ffffffffffffffffffffffffffffffffffffffff";
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46431 diff changeset	128
44005 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 {
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	139 ParentOutOfRange(Revision),
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	140 }
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	141
52041 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	142 impl std::fmt::Display for GraphError {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	143 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: 51864 diff changeset	144 match self {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	145 GraphError::ParentOutOfRange(revision) => {
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	146 write!(f, "parent out of range ({})", revision)
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	147 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	148 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	149 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	150 }
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	151
51616 b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51253 diff changeset	152 impl<T: Graph> Graph for &T {
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51253 diff changeset	153 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: 51253 diff changeset	154 (*self).parents(rev)
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51253 diff changeset	155 }
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51253 diff changeset	156 }
b08c5fbe0e70 rust: blanket implementation of Graph for Graph references Georges Racinet <georges.racinet@octobus.net> parents: 51253 diff changeset	157
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	158 /// The Mercurial Revlog Index
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	159 ///
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	160 /// 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: 44143 diff changeset	161 /// the [`nodemap`](nodemap/index.html) module
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	162 pub trait RevlogIndex {
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	163 /// Total number of Revisions referenced in this index
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	164 fn len(&self) -> usize;
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	165
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	166 fn is_empty(&self) -> bool {
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	167 self.len() == 0
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	168 }
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	169
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	170 /// Return a reference to the Node or `None` for `NULL_REVISION`
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	171 fn node(&self, rev: Revision) -> Option<&Node>;
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	172
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	173 /// Return a [`Revision`] if `rev` is a valid revision number for this
51200 7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	174 /// index.
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	175 ///
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	176 /// [`NULL_REVISION`] is considered to be valid.
51253 83de5a06f6eb rust-index: allow inlining `check_revision` across crates Rapha?l Gom?s <rgomes@octobus.net> parents: 51200 diff changeset	177 #[inline(always)]
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	178 fn check_revision(&self, rev: UncheckedRevision) -> Option<Revision> {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	179 let rev = rev.0;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	180
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	181 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: 50975 diff changeset	182 {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	183 Some(Revision(rev))
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	184 } else {
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	185 None
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	186 }
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	187 }
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	188 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	189
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	190 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: 47961 diff changeset	191 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: 47961 diff changeset	192 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: 47961 diff changeset	193 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: 47961 diff changeset	194
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	195 // 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: 47961 diff changeset	196 // mercurial/revlogutils/flagutil.py
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	197 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: 47961 diff changeset	198 \| REVISION_FLAG_ELLIPSIS
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	199 \| REVISION_FLAG_EXTSTORED
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	200 \| REVISION_FLAG_HASCOPIESINFO;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	201
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	202 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: 47961 diff changeset	203
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	204 #[derive(Debug, derive_more::From, derive_more::Display)]
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	205 pub enum RevlogError {
52041 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	206 #[display(fmt = "invalid revision identifier: {}", "_0")]
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	207 InvalidRevision(String),
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	208 /// Working directory is not supported
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	209 WDirUnsupported,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	210 /// Found more than one entry whose ID match the requested prefix
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	211 AmbiguousPrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	212 #[from]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	213 Other(HgError),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	214 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	215
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	216 impl From<NodeMapError> for RevlogError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	217 fn from(error: NodeMapError) -> Self {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	218 match error {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	219 NodeMapError::MultipleResults => RevlogError::AmbiguousPrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	220 NodeMapError::RevisionNotInIndex(rev) => RevlogError::corrupted(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	221 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: 47961 diff changeset	222 ),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	223 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	224 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	225 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	226
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	227 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: 47961 diff changeset	228 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: 47961 diff changeset	229 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	230
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	231 impl RevlogError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	232 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: 47961 diff changeset	233 RevlogError::Other(corrupted(context))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	234 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	235 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	236
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	237 #[derive(derive_more::Display, Debug, Copy, Clone, PartialEq, Eq)]
51861 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	238 pub enum RevlogType {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	239 Changelog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	240 Manifestlog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	241 Filelog,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	242 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	243
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	244 impl TryFrom<usize> for RevlogType {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	245 type Error = HgError;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	246
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	247 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: 51620 diff changeset	248 match value {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	249 1001 => Ok(Self::Changelog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	250 1002 => Ok(Self::Manifestlog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	251 1003 => Ok(Self::Filelog),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	252 t => Err(HgError::abort(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	253 format!("Unknown revlog type {}", t),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	254 exit_codes::ABORT,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	255 None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	256 )),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	257 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	258 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	259 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	260
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	261 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	262 pub enum CompressionEngine {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	263 Zlib {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	264 /// Between 0 and 9 included
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	265 level: u32,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	266 },
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	267 Zstd {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	268 /// Between 0 and 22 included
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	269 level: u32,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	270 /// Never used in practice for now
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	271 threads: u32,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	272 },
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	273 /// No compression is performed
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	274 None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	275 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	276 impl CompressionEngine {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	277 pub fn set_level(&mut self, new_level: usize) -> Result<(), HgError> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	278 match self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	279 CompressionEngine::Zlib { level } => {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	280 if new_level > 9 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	281 return Err(HgError::abort(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	282 format!(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	283 "invalid compression zlib compression level {}",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	284 new_level
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	285 ),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	286 exit_codes::ABORT,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	287 None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	288 ));
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	289 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	290 *level = new_level as u32;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	291 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	292 CompressionEngine::Zstd { level, .. } => {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	293 if new_level > 22 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	294 return Err(HgError::abort(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	295 format!(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	296 "invalid compression zstd compression level {}",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	297 new_level
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	298 ),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	299 exit_codes::ABORT,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	300 None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	301 ));
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	302 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	303 *level = new_level as u32;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	304 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	305 CompressionEngine::None => {}
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	306 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	307 Ok(())
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	308 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	309
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	310 pub fn zstd(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	311 zstd_level: Option<u32>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	312 ) -> Result<CompressionEngine, HgError> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	313 let mut engine = CompressionEngine::Zstd {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	314 level: 3,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	315 threads: 0,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	316 };
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	317 if let Some(level) = zstd_level {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	318 engine.set_level(level as usize)?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	319 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	320 Ok(engine)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	321 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	322 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	323
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	324 impl Default for CompressionEngine {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	325 fn default() -> Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	326 Self::Zlib { level: 6 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	327 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	328 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	329
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	330 #[derive(Debug, Clone, Copy, PartialEq)]
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	331 /// Holds configuration values about how the revlog data is read
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	332 pub struct RevlogDataConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	333 /// Should we try to open the "pending" version of the revlog
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	334 pub try_pending: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	335 /// Should we try to open the "split" version of the revlog
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	336 pub try_split: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	337 /// When True, `indexfile` should be opened with `checkambig=True` at
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	338 /// writing time, to avoid file stat ambiguity
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	339 pub check_ambig: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	340 /// If true, use mmap instead of reading to deal with large indexes
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	341 pub mmap_large_index: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	342 /// How much data is considered large
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	343 pub mmap_index_threshold: Option<u64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	344 /// How much data to read and cache into the raw revlog data cache
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	345 pub chunk_cache_size: u64,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	346 /// The size of the uncompressed cache compared to the largest revision
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	347 /// seen
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	348 pub uncompressed_cache_factor: Option<f64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	349 /// The number of chunks cached
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	350 pub uncompressed_cache_count: Option<u64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	351 /// Allow sparse reading of the revlog data
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	352 pub with_sparse_read: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	353 /// Minimal density of a sparse read chunk
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	354 pub sr_density_threshold: f64,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	355 /// Minimal size of the data we skip when performing sparse reads
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	356 pub sr_min_gap_size: u64,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	357 /// Whether deltas are encoded against arbitrary bases
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	358 pub general_delta: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	359 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	360
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	361 impl RevlogDataConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	362 pub fn new(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	363 config: &Config,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	364 requirements: &HashSet<String>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	365 ) -> Result<Self, HgError> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	366 let mut data_config = Self::default();
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	367 if let Some(chunk_cache_size) =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	368 config.get_byte_size(b"format", b"chunkcachesize")?
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	369 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	370 data_config.chunk_cache_size = chunk_cache_size;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	371 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	372
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	373 let memory_profile = config.get_resource_profile(Some("memory"));
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	374 if memory_profile.value >= ResourceProfileValue::Medium {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	375 data_config.uncompressed_cache_count = Some(10_000);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	376 data_config.uncompressed_cache_factor = Some(4.0);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	377 if memory_profile.value >= ResourceProfileValue::High {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	378 data_config.uncompressed_cache_factor = Some(10.0)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	379 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	380 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	381
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	382 if let Some(mmap_index_threshold) = config
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	383 .get_byte_size(b"storage", b"revlog.mmap.index:size-threshold")?
51861 0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	384 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	385 data_config.mmap_index_threshold = Some(mmap_index_threshold);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	386 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	387
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	388 let with_sparse_read =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	389 config.get_bool(b"experimental", b"sparse-read")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	390 if let Some(sr_density_threshold) = config
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	391 .get_f64(b"experimental", b"sparse-read.density-threshold")?
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	392 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	393 data_config.sr_density_threshold = sr_density_threshold;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	394 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	395 data_config.with_sparse_read = with_sparse_read;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	396 if let Some(sr_min_gap_size) = config
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	397 .get_byte_size(b"experimental", b"sparse-read.min-gap-size")?
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	398 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	399 data_config.sr_min_gap_size = sr_min_gap_size;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	400 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	401
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	402 data_config.with_sparse_read =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	403 requirements.contains(SPARSEREVLOG_REQUIREMENT);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	404
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	405 Ok(data_config)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	406 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	407 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	408
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	409 impl Default for RevlogDataConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	410 fn default() -> Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	411 Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	412 chunk_cache_size: 65536,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	413 sr_density_threshold: 0.50,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	414 sr_min_gap_size: 262144,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	415 try_pending: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	416 try_split: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	417 check_ambig: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	418 mmap_large_index: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	419 mmap_index_threshold: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	420 uncompressed_cache_factor: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	421 uncompressed_cache_count: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	422 with_sparse_read: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	423 general_delta: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	424 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	425 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	426 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	427
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	428 #[derive(Debug, Clone, Copy, PartialEq)]
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	429 /// Holds configuration values about how new deltas are computed.
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	430 ///
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	431 /// Some attributes are duplicated from [`RevlogDataConfig`] to help having
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	432 /// each object self contained.
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	433 pub struct RevlogDeltaConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	434 /// Whether deltas can be encoded against arbitrary bases
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	435 pub general_delta: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	436 /// Allow sparse writing of the revlog data
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	437 pub sparse_revlog: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	438 /// Maximum length of a delta chain
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	439 pub max_chain_len: Option<u64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	440 /// Maximum distance between a delta chain's start and end
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	441 pub max_deltachain_span: Option<u64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	442 /// If `upper_bound_comp` is not None, this is the expected maximal
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	443 /// gain from compression for the data content
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	444 pub upper_bound_comp: Option<f64>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	445 /// Should we try a delta against both parents
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	446 pub delta_both_parents: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	447 /// Test delta base candidate groups by chunks of this maximal size
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	448 pub candidate_group_chunk_size: u64,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	449 /// Should we display debug information about delta computation
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	450 pub debug_delta: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	451 /// Trust incoming deltas by default
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	452 pub lazy_delta: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	453 /// Trust the base of incoming deltas by default
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	454 pub lazy_delta_base: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	455 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	456 impl RevlogDeltaConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	457 pub fn new(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	458 config: &Config,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	459 requirements: &HashSet<String>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	460 revlog_type: RevlogType,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	461 ) -> Result<Self, HgError> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	462 let mut delta_config = Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	463 delta_both_parents: config
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	464 .get_option_no_default(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	465 b"storage",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	466 b"revlog.optimize-delta-parent-choice",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	467 )?
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	468 .unwrap_or(true),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	469 candidate_group_chunk_size: config
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	470 .get_u64(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	471 b"storage",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	472 b"revlog.delta-parent-search.candidate-group-chunk-size",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	473 )?
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	474 .unwrap_or_default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	475 ..Default::default()
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	476 };
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	477
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	478 delta_config.debug_delta =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	479 config.get_bool(b"debug", b"revlog.debug-delta")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	480
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	481 delta_config.general_delta =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	482 requirements.contains(GENERALDELTA_REQUIREMENT);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	483
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	484 let lazy_delta =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	485 config.get_bool(b"storage", b"revlog.reuse-external-delta")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	486
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	487 if revlog_type == RevlogType::Manifestlog {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	488 // upper bound of what we expect from compression
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	489 // (real life value seems to be 3)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	490 delta_config.upper_bound_comp = Some(3.0)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	491 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	492
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	493 let mut lazy_delta_base = false;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	494 if lazy_delta {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	495 lazy_delta_base = match config.get_option_no_default(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	496 b"storage",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	497 b"revlog.reuse-external-delta-parent",
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	498 )? {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	499 Some(base) => base,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	500 None => config.get_bool(b"format", b"generaldelta")?,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	501 };
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	502 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	503 delta_config.lazy_delta = lazy_delta;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	504 delta_config.lazy_delta_base = lazy_delta_base;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	505
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	506 delta_config.max_deltachain_span =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	507 match config.get_i64(b"experimental", b"maxdeltachainspan")? {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	508 Some(span) => {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	509 if span < 0 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	510 None
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	511 } else {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	512 Some(span as u64)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	513 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	514 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	515 None => None,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	516 };
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	517
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	518 delta_config.sparse_revlog =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	519 requirements.contains(SPARSEREVLOG_REQUIREMENT);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	520
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	521 delta_config.max_chain_len =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	522 config.get_byte_size_no_default(b"format", b"maxchainlen")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	523
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	524 Ok(delta_config)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	525 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	526 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	527
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	528 impl Default for RevlogDeltaConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	529 fn default() -> Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	530 Self {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	531 delta_both_parents: true,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	532 lazy_delta: true,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	533 general_delta: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	534 sparse_revlog: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	535 max_chain_len: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	536 max_deltachain_span: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	537 upper_bound_comp: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	538 candidate_group_chunk_size: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	539 debug_delta: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	540 lazy_delta_base: Default::default(),
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	541 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	542 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	543 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	544
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	545 #[derive(Debug, Default, Clone, Copy, PartialEq)]
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	546 /// Holds configuration values about the available revlog features
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	547 pub struct RevlogFeatureConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	548 /// The compression engine and its options
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	549 pub compression_engine: CompressionEngine,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	550 /// Can we use censor on this revlog
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	551 pub censorable: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	552 /// Does this revlog use the "side data" feature
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	553 pub has_side_data: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	554 /// Might remove this configuration once the rank computation has no
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	555 /// impact
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	556 pub compute_rank: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	557 /// Parent order is supposed to be semantically irrelevant, so we
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	558 /// normally re-sort parents to ensure that the first parent is non-null,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	559 /// if there is a non-null parent at all.
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	560 /// filelog abuses the parent order as a flag to mark some instances of
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	561 /// meta-encoded files, so allow it to disable this behavior.
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	562 pub canonical_parent_order: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	563 /// Can ellipsis commit be used
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	564 pub enable_ellipsis: bool,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	565 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	566 impl RevlogFeatureConfig {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	567 pub fn new(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	568 config: &Config,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	569 requirements: &HashSet<String>,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	570 ) -> Result<Self, HgError> {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	571 let mut feature_config = Self::default();
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	572
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	573 let zlib_level = config.get_u32(b"storage", b"revlog.zlib.level")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	574 let zstd_level = config.get_u32(b"storage", b"revlog.zstd.level")?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	575
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	576 feature_config.compression_engine = CompressionEngine::default();
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	577
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	578 for requirement in requirements {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	579 if requirement.starts_with("revlog-compression-")
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	580 \|\| requirement.starts_with("exp-compression-")
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	581 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	582 let split = &mut requirement.splitn(3, '-');
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	583 split.next();
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	584 split.next();
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	585 feature_config.compression_engine = match split.next().unwrap()
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	586 {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	587 "zstd" => CompressionEngine::zstd(zstd_level)?,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	588 e => {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	589 return Err(HgError::UnsupportedFeature(format!(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	590 "Unsupported compression engine '{e}'"
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	591 )))
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	592 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	593 };
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	594 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	595 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	596 if let Some(level) = zlib_level {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	597 if matches!(
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	598 feature_config.compression_engine,
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	599 CompressionEngine::Zlib { .. }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	600 ) {
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	601 feature_config
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	602 .compression_engine
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	603 .set_level(level as usize)?;
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	604 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	605 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	606
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	607 feature_config.enable_ellipsis =
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	608 requirements.contains(NARROW_REQUIREMENT);
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	609
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	610 Ok(feature_config)
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	611 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	612 }
0604673428b7 rust-revlog: add revlog-specific config objects Rapha?l Gom?s <rgomes@octobus.net> parents: 51620 diff changeset	613
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	614 /// Read only implementation of revlog.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	615 pub struct Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	616 /// When index and data are not interleaved: bytes of the revlog index.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	617 /// When index and data are interleaved: bytes of the revlog index and
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	618 /// data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	619 index: Index,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	620 /// When index and data are not interleaved: bytes of the revlog data
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	621 data_bytes: Option<Box<dyn Deref<Target = [u8]> + Send>>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	622 /// 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: 47961 diff changeset	623 nodemap: Option<nodemap::NodeTree>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	624 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	625
50975 27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	626 impl Graph for Revlog {
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	627 fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	628 self.index.parents(rev)
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	629 }
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	630 }
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	631
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	632 #[derive(Debug, Copy, Clone, PartialEq)]
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	633 pub enum RevlogVersionOptions {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	634 V0,
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	635 V1 { general_delta: bool, inline: bool },
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	636 V2,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	637 ChangelogV2 { compute_rank: bool },
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	638 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	639
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	640 /// Options to govern how a revlog should be opened, usually from the
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	641 /// repository configuration or requirements.
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	642 #[derive(Debug, Copy, Clone)]
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	643 pub struct RevlogOpenOptions {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	644 /// The revlog version, along with any option specific to this version
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	645 pub version: RevlogVersionOptions,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	646 /// Whether the revlog uses a persistent nodemap.
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	647 pub use_nodemap: bool,
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	648 pub delta_config: RevlogDeltaConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	649 pub data_config: RevlogDataConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	650 pub feature_config: RevlogFeatureConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	651 }
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	652
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	653 #[cfg(test)]
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	654 impl Default for RevlogOpenOptions {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	655 fn default() -> Self {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	656 Self {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	657 version: RevlogVersionOptions::V1 {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	658 general_delta: true,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	659 inline: false,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	660 },
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	661 use_nodemap: true,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	662 data_config: Default::default(),
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	663 delta_config: Default::default(),
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	664 feature_config: Default::default(),
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	665 }
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	666 }
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	667 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	668
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	669 impl RevlogOpenOptions {
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	670 pub fn new(
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	671 inline: bool,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	672 data_config: RevlogDataConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	673 delta_config: RevlogDeltaConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	674 feature_config: RevlogFeatureConfig,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	675 ) -> Self {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	676 Self {
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	677 version: RevlogVersionOptions::V1 {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	678 general_delta: data_config.general_delta,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	679 inline,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	680 },
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	681 use_nodemap: false,
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	682 data_config,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	683 delta_config,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	684 feature_config,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	685 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	686 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	687
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	688 pub fn index_header(&self) -> index::IndexHeader {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	689 index::IndexHeader {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	690 header_bytes: match self.version {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	691 RevlogVersionOptions::V0 => [0, 0, 0, 0],
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	692 RevlogVersionOptions::V1 {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	693 general_delta,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	694 inline,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	695 } => [
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	696 0,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	697 if general_delta && inline {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	698 3
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	699 } else if general_delta {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	700 2
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	701 } else {
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	702 u8::from(inline)
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	703 },
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	704 0,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	705 1,
69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	706 ],
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	707 RevlogVersionOptions::V2 => 0xDEADu32.to_be_bytes(),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	708 RevlogVersionOptions::ChangelogV2 { compute_rank: _ } => {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	709 0xD34Du32.to_be_bytes()
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	710 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	711 },
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	712 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	713 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	714 }
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	715
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	716 impl Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	717 /// Open a revlog index file.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	718 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	719 /// 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: 47961 diff changeset	720 /// interleaved.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	721 pub fn open(
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	722 // 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: 51863 diff changeset	723 store_vfs: &VfsImpl,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	724 index_path: impl AsRef<Path>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	725 data_path: Option<&Path>,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	726 options: RevlogOpenOptions,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	727 ) -> Result<Self, HgError> {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	728 Self::open_gen(store_vfs, index_path, data_path, options, None)
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	729 }
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	730
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	731 fn open_gen(
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	732 // 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: 51863 diff changeset	733 store_vfs: &VfsImpl,
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	734 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: 50982 diff changeset	735 data_path: Option<&Path>,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	736 options: RevlogOpenOptions,
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	737 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: 50982 diff changeset	738 ) -> Result<Self, HgError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	739 let index_path = index_path.as_ref();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	740 let index = {
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50990 diff changeset	741 match store_vfs.mmap_open_opt(index_path)? {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	742 None => Index::new(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	743 Box::<Vec<_>>::default(),
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	744 options.index_header(),
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	745 ),
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	746 Some(index_mmap) => {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	747 let index = Index::new(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	748 Box::new(index_mmap),
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	749 options.index_header(),
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	750 )?;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	751 Ok(index)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	752 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	753 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	754 }?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	755
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	756 let default_data_path = index_path.with_extension("d");
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	757
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	758 // type annotation required
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	759 // won't recognize Mmap as Deref<Target = [u8]>
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	760 let data_bytes: Option<Box<dyn Deref<Target = [u8]> + Send>> =
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	761 if index.is_inline() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	762 None
51862 09ece563609a rust-revlog: don't try to open the data file if the index is empty Rapha?l Gom?s <rgomes@octobus.net> parents: 51861 diff changeset	763 } else if index.is_empty() {
09ece563609a rust-revlog: don't try to open the data file if the index is empty Rapha?l Gom?s <rgomes@octobus.net> parents: 51861 diff changeset	764 // No need to even try to open the data file then.
09ece563609a rust-revlog: don't try to open the data file if the index is empty Rapha?l Gom?s <rgomes@octobus.net> parents: 51861 diff changeset	765 Some(Box::new(&[][..]))
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	766 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	767 let data_path = data_path.unwrap_or(&default_data_path);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	768 let data_mmap = store_vfs.mmap_open(data_path)?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	769 Some(Box::new(data_mmap))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	770 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	771
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	772 let nodemap = if index.is_inline() \|\| !options.use_nodemap {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	773 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	774 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	775 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: 47961 diff changeset	776 \|(docket, data)\| {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	777 nodemap::NodeTree::load_bytes(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	778 Box::new(data),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	779 docket.data_length,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	780 )
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	781 },
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	782 )
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	783 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	784
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	785 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: 50982 diff changeset	786
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	787 Ok(Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	788 index,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	789 data_bytes,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	790 nodemap,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	791 })
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	792 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	793
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	794 /// 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: 47961 diff changeset	795 pub fn len(&self) -> usize {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	796 self.index.len()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	797 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	798
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	799 /// 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: 47961 diff changeset	800 pub fn is_empty(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	801 self.index.is_empty()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	802 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	803
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	804 /// 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: 47961 diff changeset	805 /// revlog
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	806 pub fn node_from_rev(&self, rev: UncheckedRevision) -> Option<&Node> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	807 if rev == NULL_REVISION.into() {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	808 return Some(&NULL_NODE);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	809 }
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	810 let rev = self.index.check_revision(rev)?;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	811 Some(self.index.get_entry(rev)?.hash())
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	812 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	813
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	814 /// 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: 47961 diff changeset	815 /// revlog
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	816 pub fn rev_from_node(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	817 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	818 node: NodePrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	819 ) -> Result<Revision, RevlogError> {
50982 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	820 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	821 nodemap
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	822 .find_bin(&self.index, node)?
52041 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	823 .ok_or(RevlogError::InvalidRevision(format!("{:x}", node)))
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	824 } else {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	825 self.rev_from_node_no_persistent_nodemap(node)
50982 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	826 }
50740 0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	827 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	828
50740 0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	829 /// Same as `rev_from_node`, without using a persistent nodemap
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	830 ///
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	831 /// This is used as fallback when a persistent nodemap is not present.
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	832 /// This happens when the persistent-nodemap experimental feature is not
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	833 /// enabled, or for small revlogs.
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	834 fn rev_from_node_no_persistent_nodemap(
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	835 &self,
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	836 node: NodePrefix,
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	837 ) -> Result<Revision, RevlogError> {
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	838 // Linear scan of the revlog
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	839 // TODO: consider building a non-persistent nodemap in memory to
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	840 // optimize these cases.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	841 let mut found_by_prefix = None;
50990 12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50976 50983 diff changeset	842 for rev in (-1..self.len() as BaseRevision).rev() {
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	843 let rev = Revision(rev as BaseRevision);
50990 12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50976 50983 diff changeset	844 let candidate_node = if rev == Revision(-1) {
50982 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	845 NULL_NODE
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	846 } else {
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	847 let index_entry =
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	848 self.index.get_entry(rev).ok_or_else(\|\| {
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	849 HgError::corrupted(
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	850 "revlog references a revision not in the index",
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	851 )
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	852 })?;
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	853 *index_entry.hash()
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	854 };
363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	855 if node == candidate_node {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	856 return Ok(rev);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	857 }
50982 363620b934aa revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50743 diff changeset	858 if node.is_prefix_of(&candidate_node) {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	859 if found_by_prefix.is_some() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	860 return Err(RevlogError::AmbiguousPrefix);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	861 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	862 found_by_prefix = Some(rev)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	863 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	864 }
52041 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	865 found_by_prefix
652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	866 .ok_or(RevlogError::InvalidRevision(format!("{:x}", node)))
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	867 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	868
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	869 /// Returns whether the given revision exists in this revlog.
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	870 pub fn has_rev(&self, rev: UncheckedRevision) -> bool {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	871 self.index.check_revision(rev).is_some()
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	872 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	873
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	874 /// 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: 47961 diff changeset	875 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	876 /// All entries required to build the final data out of deltas will be
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	877 /// retrieved as needed, and the deltas will be applied to the inital
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	878 /// snapshot to rebuild the final data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	879 pub fn get_rev_data(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	880 &self,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	881 rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	882 ) -> Result<Cow<[u8]>, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	883 if rev == NULL_REVISION.into() {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	884 return Ok(Cow::Borrowed(&[]));
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	885 };
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	886 self.get_entry(rev)?.data()
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	887 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	888
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	889 /// [`Self::get_rev_data`] for checked revisions.
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	890 pub fn get_rev_data_for_checked_rev(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	891 &self,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	892 rev: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	893 ) -> Result<Cow<[u8]>, RevlogError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	894 if rev == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	895 return Ok(Cow::Borrowed(&[]));
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	896 };
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	897 self.get_entry_for_checked_rev(rev)?.data()
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	898 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	899
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	900 /// 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: 47961 diff changeset	901 pub fn check_hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	902 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	903 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	904 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	905 expected: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	906 data: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	907 ) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	908 let e1 = self.index.get_entry(p1);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	909 let h1 = match e1 {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	910 Some(ref entry) => entry.hash(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	911 None => &NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	912 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	913 let e2 = self.index.get_entry(p2);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	914 let h2 = match e2 {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	915 Some(ref entry) => entry.hash(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	916 None => &NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	917 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	918
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	919 hash(data, h1.as_bytes(), h2.as_bytes()) == expected
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	920 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	921
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	922 /// 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: 47961 diff changeset	923 /// and its deltas.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	924 fn build_data_from_deltas(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	925 snapshot: RevlogEntry,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	926 deltas: &[RevlogEntry],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	927 ) -> Result<Vec<u8>, HgError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	928 let snapshot = snapshot.data_chunk()?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	929 let deltas = deltas
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	930 .iter()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	931 .rev()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	932 .map(RevlogEntry::data_chunk)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	933 .collect::<Result<Vec<_>, _>>()?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	934 let patches: Vec<_> =
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	935 deltas.iter().map(\|d\| patch::PatchList::new(d)).collect();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	936 let patch = patch::fold_patch_lists(&patches);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	937 Ok(patch.apply(&snapshot))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	938 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	939
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	940 /// Return the revlog data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	941 fn data(&self) -> &[u8] {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	942 match &self.data_bytes {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	943 Some(data_bytes) => data_bytes,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	944 None => panic!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	945 "forgot to load the data or trying to access inline data"
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	946 ),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	947 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	948 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	949
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	950 pub fn make_null_entry(&self) -> RevlogEntry {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	951 RevlogEntry {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	952 revlog: self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	953 rev: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	954 bytes: b"",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	955 compressed_len: 0,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	956 uncompressed_len: 0,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	957 base_rev_or_base_of_delta_chain: None,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	958 p1: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	959 p2: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	960 flags: NULL_REVLOG_ENTRY_FLAGS,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	961 hash: NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	962 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	963 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	964
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	965 fn get_entry_for_checked_rev(
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	966 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	967 rev: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	968 ) -> Result<RevlogEntry, RevlogError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	969 if rev == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	970 return Ok(self.make_null_entry());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	971 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	972 let index_entry = self
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	973 .index
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	974 .get_entry(rev)
52041 652149ed64f0 rust: improve `InvalidRevision` error message Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	975 .ok_or(RevlogError::InvalidRevision(rev.to_string()))?;
51442 d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	976 let offset = index_entry.offset();
d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	977 let start = if self.index.is_inline() {
d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	978 offset + ((rev.0 as usize + 1) * INDEX_ENTRY_SIZE)
d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	979 } else {
d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	980 offset
d2858d97af6c rust-index: drop offset_override Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51441 diff changeset	981 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	982 let end = start + index_entry.compressed_len() as usize;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	983 let data = if self.index.is_inline() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	984 self.index.data(start, end)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	985 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	986 &self.data()[start..end]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	987 };
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	988 let base_rev = self
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	989 .index
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	990 .check_revision(index_entry.base_revision_or_base_of_delta_chain())
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	991 .ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	992 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	993 "base revision for rev {} is invalid",
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	994 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	995 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	996 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	997 let p1 =
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	998 self.index.check_revision(index_entry.p1()).ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	999 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1000 "p1 for rev {} is invalid",
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1001 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1002 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1003 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1004 let p2 =
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1005 self.index.check_revision(index_entry.p2()).ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1006 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1007 "p2 for rev {} is invalid",
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1008 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1009 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1010 })?;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1011 let entry = RevlogEntry {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1012 revlog: self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1013 rev,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1014 bytes: data,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1015 compressed_len: index_entry.compressed_len(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1016 uncompressed_len: index_entry.uncompressed_len(),
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1017 base_rev_or_base_of_delta_chain: if base_rev == rev {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1018 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1019 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1020 Some(base_rev)
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1021 },
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1022 p1,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1023 p2,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1024 flags: index_entry.flags(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1025 hash: *index_entry.hash(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1026 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1027 Ok(entry)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1028 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1029
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1030 /// Get an entry of the revlog.
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1031 pub fn get_entry(
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1032 &self,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1033 rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1034 ) -> Result<RevlogEntry, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1035 if rev == NULL_REVISION.into() {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1036 return Ok(self.make_null_entry());
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1037 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1038 let rev = self.index.check_revision(rev).ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1039 RevlogError::corrupted(format!("rev {} is invalid", rev))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1040 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1041 self.get_entry_for_checked_rev(rev)
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1042 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1043 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1044
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1045 /// 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: 47961 diff changeset	1046 /// the entry's data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1047 #[derive(Clone)]
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1048 pub struct RevlogEntry<'revlog> {
7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1049 revlog: &'revlog Revlog,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1050 rev: Revision,
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1051 bytes: &'revlog [u8],
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1052 compressed_len: u32,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1053 uncompressed_len: i32,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1054 base_rev_or_base_of_delta_chain: Option<Revision>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1055 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1056 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1057 flags: u16,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1058 hash: Node,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1059 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1060
50503 74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1061 thread_local! {
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1062 // seems fine to [unwrap] here: this can only fail due to memory allocation
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1063 // failing, and it's normal for that to cause panic.
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1064 static ZSTD_DECODER : RefCell<zstd::bulk::Decompressor<'static>> =
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1065 RefCell::new(zstd::bulk::Decompressor::new().ok().unwrap());
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1066 }
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1067
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1068 fn zstd_decompress_to_buffer(
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1069 bytes: &[u8],
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1070 buf: &mut Vec<u8>,
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1071 ) -> Result<usize, std::io::Error> {
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1072 ZSTD_DECODER
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1073 .with(\|decoder\| decoder.borrow_mut().decompress_to_buffer(bytes, buf))
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1074 }
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1075
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1076 impl<'revlog> RevlogEntry<'revlog> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1077 pub fn revision(&self) -> Revision {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1078 self.rev
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1079 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1080
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1081 pub fn node(&self) -> &Node {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1082 &self.hash
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1083 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1084
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1085 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: 47961 diff changeset	1086 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: 47961 diff changeset	1087 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1088
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1089 pub fn has_p1(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1090 self.p1 != NULL_REVISION
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1091 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1092
50410 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1093 pub fn p1_entry(
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1094 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1095 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1096 if self.p1 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1097 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1098 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1099 Ok(Some(self.revlog.get_entry_for_checked_rev(self.p1)?))
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1100 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1101 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1102
50410 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1103 pub fn p2_entry(
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1104 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	1105 ) -> Result<Option<RevlogEntry<'revlog>>, RevlogError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1106 if self.p2 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1107 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1108 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1109 Ok(Some(self.revlog.get_entry_for_checked_rev(self.p2)?))
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1110 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1111 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1112
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1113 pub fn p1(&self) -> Option<Revision> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1114 if self.p1 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1115 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1116 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1117 Some(self.p1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1118 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1119 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1120
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1121 pub fn p2(&self) -> Option<Revision> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1122 if self.p2 == NULL_REVISION {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1123 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1124 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1125 Some(self.p2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1126 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1127 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1128
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1129 pub fn is_censored(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1130 (self.flags & REVISION_FLAG_CENSORED) != 0
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1131 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1132
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1133 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: 47961 diff changeset	1134 // Relevant Python code: revlog.size()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1135 // 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: 47961 diff changeset	1136 (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: 47961 diff changeset	1137 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1138
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1139 /// The data for this entry, after resolving deltas if any.
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1140 pub fn rawdata(&self) -> Result<Cow<'revlog, [u8]>, RevlogError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1141 let mut entry = self.clone();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1142 let mut delta_chain = vec![];
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1143
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1144 // The meaning of `base_rev_or_base_of_delta_chain` depends on
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1145 // generaldelta. See the doc on `ENTRY_DELTA_BASE` in
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1146 // `mercurial/revlogutils/constants.py` and the code in
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1147 // [_chaininfo] and in [index_deltachain].
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1148 let uses_generaldelta = self.revlog.index.uses_generaldelta();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1149 while let Some(base_rev) = entry.base_rev_or_base_of_delta_chain {
50973 9929c8a73488 rust-revlog: split logic for `rawdata` to prepare for `UncheckedRevision` use Rapha?l Gom?s <rgomes@octobus.net> parents: 50972 diff changeset	1150 entry = if uses_generaldelta {
9929c8a73488 rust-revlog: split logic for `rawdata` to prepare for `UncheckedRevision` use Rapha?l Gom?s <rgomes@octobus.net> parents: 50972 diff changeset	1151 delta_chain.push(entry);
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1152 self.revlog.get_entry_for_checked_rev(base_rev)?
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1153 } else {
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1154 let base_rev = UncheckedRevision(entry.rev.0 - 1);
50973 9929c8a73488 rust-revlog: split logic for `rawdata` to prepare for `UncheckedRevision` use Rapha?l Gom?s <rgomes@octobus.net> parents: 50972 diff changeset	1155 delta_chain.push(entry);
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1156 self.revlog.get_entry(base_rev)?
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1157 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1158 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1159
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1160 let data = if delta_chain.is_empty() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1161 entry.data_chunk()?
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1162 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1163 Revlog::build_data_from_deltas(entry, &delta_chain)?.into()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1164 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1165
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1166 Ok(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1167 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1168
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1169 fn check_data(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1170 &self,
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1171 data: Cow<'revlog, [u8]>,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1172 ) -> Result<Cow<'revlog, [u8]>, RevlogError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1173 if self.revlog.check_hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1174 self.p1,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1175 self.p2,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1176 self.hash.as_bytes(),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1177 &data,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1178 ) {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1179 Ok(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1180 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1181 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: 47961 diff changeset	1182 return Err(HgError::unsupported(
52056 8b7123c8947b update: add a Rust fast-path when updating from null (and clean) Rapha?l Gom?s <rgomes@octobus.net> parents: 52041 diff changeset	1183 "support for ellipsis nodes is missing",
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1184 )
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1185 .into());
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1186 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1187 Err(corrupted(format!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1188 "hash check failed for revision {}",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1189 self.rev
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1190 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1191 .into())
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1192 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1193 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1194
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1195 pub fn data(&self) -> Result<Cow<'revlog, [u8]>, RevlogError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1196 let data = self.rawdata()?;
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	1197 if self.rev == NULL_REVISION {
124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	1198 return Ok(data);
124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	1199 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1200 if self.is_censored() {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1201 return Err(HgError::CensoredNodeError.into());
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1202 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1203 self.check_data(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1204 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1205
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1206 /// Extract the data contained in the entry.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1207 /// This may be a delta. (See `is_delta`.)
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	1208 fn data_chunk(&self) -> Result<Cow<'revlog, [u8]>, HgError> {
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1209 if self.bytes.is_empty() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1210 return Ok(Cow::Borrowed(&[]));
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1211 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1212 match self.bytes[0] {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1213 // Revision data is the entirety of the entry, including this
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1214 // header.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1215 b'\0' => Ok(Cow::Borrowed(self.bytes)),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1216 // Raw revision data follows.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1217 b'u' => Ok(Cow::Borrowed(&self.bytes[1..])),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1218 // zlib (RFC 1950) data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1219 b'x' => Ok(Cow::Owned(self.uncompressed_zlib_data()?)),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1220 // zstd data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1221 b'\x28' => Ok(Cow::Owned(self.uncompressed_zstd_data()?)),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1222 // A proper new format should have had a repo/store requirement.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1223 format_type => Err(corrupted(format!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1224 "unknown compression header '{}'",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1225 format_type
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1226 ))),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1227 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1228 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1229
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1230 fn uncompressed_zlib_data(&self) -> Result<Vec<u8>, HgError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1231 let mut decoder = ZlibDecoder::new(self.bytes);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1232 if self.is_delta() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1233 let mut buf = Vec::with_capacity(self.compressed_len as usize);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1234 decoder
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1235 .read_to_end(&mut buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1236 .map_err(\|e\| corrupted(e.to_string()))?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1237 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1238 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1239 let cap = self.uncompressed_len.max(0) as usize;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1240 let mut buf = vec![0; cap];
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1241 decoder
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1242 .read_exact(&mut buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1243 .map_err(\|e\| corrupted(e.to_string()))?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1244 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1245 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1246 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1247
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1248 fn uncompressed_zstd_data(&self) -> Result<Vec<u8>, HgError> {
50505 39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1249 let cap = self.uncompressed_len.max(0) as usize;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1250 if self.is_delta() {
50505 39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1251 // [cap] is usually an over-estimate of the space needed because
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1252 // it's the length of delta-decoded data, but we're interested
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1253 // in the size of the delta.
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1254 // This means we have to [shrink_to_fit] to avoid holding on
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1255 // to a large chunk of memory, but it also means we must have a
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1256 // fallback branch, for the case when the delta is longer than
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1257 // the original data (surprisingly, this does happen in practice)
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1258 let mut buf = Vec::with_capacity(cap);
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1259 match zstd_decompress_to_buffer(self.bytes, &mut buf) {
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1260 Ok(_) => buf.shrink_to_fit(),
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1261 Err(_) => {
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1262 buf.clear();
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1263 zstd::stream::copy_decode(self.bytes, &mut buf)
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1264 .map_err(\|e\| corrupted(e.to_string()))?;
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1265 }
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	1266 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1267 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1268 } else {
50504 d1cab48354bc rust: in zstd decompression, avoid a useless vec initialization Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50503 diff changeset	1269 let mut buf = Vec::with_capacity(cap);
50503 74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	1270 let len = zstd_decompress_to_buffer(self.bytes, &mut buf)
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1271 .map_err(\|e\| corrupted(e.to_string()))?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1272 if len != self.uncompressed_len as usize {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1273 Err(corrupted("uncompressed length does not match"))
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1274 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1275 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1276 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1277 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1278 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1279
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1280 /// Tell if the entry is a snapshot or a delta
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1281 /// (influences on decompression).
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1282 fn is_delta(&self) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1283 self.base_rev_or_base_of_delta_chain.is_some()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1284 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1285 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1286
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1287 /// Calculate the hash of a revision given its data and its parents.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1288 fn hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1289 data: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1290 p1_hash: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1291 p2_hash: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1292 ) -> [u8; NODE_BYTES_LENGTH] {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1293 let mut hasher = Sha1::new();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1294 let (a, b) = (p1_hash, p2_hash);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1295 if a > b {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1296 hasher.update(b);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1297 hasher.update(a);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1298 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1299 hasher.update(a);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1300 hasher.update(b);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1301 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1302 hasher.update(data);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1303 *hasher.finalize().as_ref()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1304 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1305
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1306 #[cfg(test)]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1307 mod tests {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1308 use super::*;
51441 c3f2a9b55f59 rust-index: stop calling `with_offset` in the tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51253 diff changeset	1309 use crate::index::IndexEntryBuilder;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1310 use itertools::Itertools;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1311
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1312 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1313 fn test_empty() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1314 let temp = tempfile::tempdir().unwrap();
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1315 let vfs = VfsImpl {
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1316 base: temp.path().to_owned(),
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1317 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1318 std::fs::write(temp.path().join("foo.i"), b"").unwrap();
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	1319 std::fs::write(temp.path().join("foo.d"), b"").unwrap();
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1320 let revlog =
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	1321 Revlog::open(&vfs, "foo.i", None, RevlogOpenOptions::default())
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1322 .unwrap();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1323 assert!(revlog.is_empty());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1324 assert_eq!(revlog.len(), 0);
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1325 assert!(revlog.get_entry(0.into()).is_err());
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1326 assert!(!revlog.has_rev(0.into()));
50742 3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	1327 assert_eq!(
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	1328 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	1329 NULL_REVISION
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	1330 );
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1331 let null_entry = revlog.get_entry(NULL_REVISION.into()).ok().unwrap();
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	1332 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	1333 assert!(null_entry.data().unwrap().is_empty());
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1334 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1335
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1336 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1337 fn test_inline() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1338 let temp = tempfile::tempdir().unwrap();
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1339 let vfs = VfsImpl {
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1340 base: temp.path().to_owned(),
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1341 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1342 let node0 = Node::from_hex("2ed2a3912a0b24502043eae84ee4b279c18b90dd")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1343 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1344 let node1 = Node::from_hex("b004912a8510032a0350a74daa2803dadfb00e12")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1345 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1346 let node2 = Node::from_hex("dd6ad206e907be60927b5a3117b97dffb2590582")
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1347 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1348 let entry0_bytes = IndexEntryBuilder::new()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1349 .is_first(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1350 .with_version(1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1351 .with_inline(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1352 .with_node(node0)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1353 .build();
51441 c3f2a9b55f59 rust-index: stop calling `with_offset` in the tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51253 diff changeset	1354 let entry1_bytes = IndexEntryBuilder::new().with_node(node1).build();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1355 let entry2_bytes = IndexEntryBuilder::new()
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1356 .with_p1(Revision(0))
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1357 .with_p2(Revision(1))
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1358 .with_node(node2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1359 .build();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1360 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: 47961 diff changeset	1361 .into_iter()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1362 .flatten()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1363 .collect_vec();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1364 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1365 let revlog =
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	1366 Revlog::open(&vfs, "foo.i", None, RevlogOpenOptions::default())
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1367 .unwrap();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1368
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1369 let entry0 = revlog.get_entry(0.into()).ok().unwrap();
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1370 assert_eq!(entry0.revision(), Revision(0));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1371 assert_eq!(*entry0.node(), node0);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1372 assert!(!entry0.has_p1());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1373 assert_eq!(entry0.p1(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1374 assert_eq!(entry0.p2(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1375 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: 47961 diff changeset	1376 assert!(p1_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1377 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: 47961 diff changeset	1378 assert!(p2_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1379
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1380 let entry1 = revlog.get_entry(1.into()).ok().unwrap();
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1381 assert_eq!(entry1.revision(), Revision(1));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1382 assert_eq!(*entry1.node(), node1);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1383 assert!(!entry1.has_p1());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1384 assert_eq!(entry1.p1(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1385 assert_eq!(entry1.p2(), None);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1386 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: 47961 diff changeset	1387 assert!(p1_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1388 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: 47961 diff changeset	1389 assert!(p2_entry.is_none());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1390
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1391 let entry2 = revlog.get_entry(2.into()).ok().unwrap();
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1392 assert_eq!(entry2.revision(), Revision(2));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1393 assert_eq!(*entry2.node(), node2);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1394 assert!(entry2.has_p1());
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1395 assert_eq!(entry2.p1(), Some(Revision(0)));
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1396 assert_eq!(entry2.p2(), Some(Revision(1)));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1397 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: 47961 diff changeset	1398 assert!(p1_entry.is_some());
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1399 assert_eq!(p1_entry.unwrap().revision(), Revision(0));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1400 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: 47961 diff changeset	1401 assert!(p2_entry.is_some());
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1402 assert_eq!(p2_entry.unwrap().revision(), Revision(1));
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1403 }
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1404
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1405 #[test]
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1406 fn test_nodemap() {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1407 let temp = tempfile::tempdir().unwrap();
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1408 let vfs = VfsImpl {
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1409 base: temp.path().to_owned(),
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	1410 };
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1411
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1412 // 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	1413 // 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	1414 // 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	1415 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	1416 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1417 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	1418 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1419 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	1420 .is_first(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1421 .with_version(1)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1422 .with_inline(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1423 .with_node(node0)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1424 .build();
51441 c3f2a9b55f59 rust-index: stop calling `with_offset` in the tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51253 diff changeset	1425 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	1426 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	1427 .into_iter()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1428 .flatten()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1429 .collect_vec();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1430 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	1431
eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	1432 let mut idx = nodemap::tests::TestNtIndex::new();
50990 12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50976 50983 diff changeset	1433 idx.insert_node(Revision(0), node0).unwrap();
12c308c55e53 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50976 50983 diff changeset	1434 idx.insert_node(Revision(1), node1).unwrap();
50983 eccf7dc7c91e revlog: make the rust test for node hex prefix resolution exercise the nodemap Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50982 diff changeset	1435
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1436 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: 51117 diff changeset	1437 &vfs,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1438 "foo.i",
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1439 None,
51863 69b804c8e09e rust: use new revlog configs in all revlog opening code Rapha?l Gom?s <rgomes@octobus.net> parents: 51862 diff changeset	1440 RevlogOpenOptions::default(),
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1441 Some(idx.nt),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1442 )
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	1443 .unwrap();
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1444
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1445 // accessing the data shows the corruption
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	1446 revlog.get_entry(0.into()).unwrap().data().unwrap_err();
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1447
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1448 assert_eq!(
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1449 revlog.rev_from_node(NULL_NODE.into()).unwrap(),
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1450 Revision(-1)
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1451 );
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1452 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: 50975 diff changeset	1453 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	1454 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1455 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1456 .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	1457 .unwrap(),
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1458 Revision(-1)
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1459 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1460 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1461 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1462 .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	1463 .unwrap(),
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50975 diff changeset	1464 Revision(1)
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1465 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1466 // 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	1467 // (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	1468 match revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1469 .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	1470 .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	1471 {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1472 RevlogError::AmbiguousPrefix => (),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1473 e => {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1474 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	1475 }
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1476 };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	1477 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	1478 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/revlog/mod.rs @ 52186:e6a44bc91bc2 stable