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

annotate rust/hg-core/src/revlog/mod.rs @ 50974:1928b770e3e7

rust: use the new `UncheckedRevision` everywhere applicable This step converts all revisions that shouldn't be considered "valid" in any context to `UncheckedRevison`, allowing `Revision` to be changed for a stronger type in a later changeset. Note that the conversion from unchecked to checked is manual and requires at least some thought from the programmer, although directly using `Revision` is still possible. A later changeset will make this mistake harder to make.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Thu, 10 Aug 2023 11:00:34 +0200
parents	9929c8a73488
children	27e773aa607d

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;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	20 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	21 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	22 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	23
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	24 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	25 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	26 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	27 use zstd;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	28
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	29 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	30 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	31 use super::index::Index;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	32 use super::nodemap::{NodeMap, NodeMapError};
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	33 use crate::errors::HgError;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	34 use crate::vfs::Vfs;
44142 63db6657d280 rust-nodemap: building blocks for nodetree structures Georges Racinet <georges.racinet@octobus.net> parents: 44088 diff changeset	35
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	36 /// Mercurial revision numbers
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	37 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	38 /// 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	39 /// 4 bytes, and are liberally converted to ints, whence the i32
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	40 pub type Revision = i32;
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	41
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	42 /// Unchecked Mercurial revision numbers.
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	43 ///
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	44 /// Values of this type have no guarantee of being a valid revision number
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	45 /// in any context. Use method `check_revision` to get a valid revision within
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	46 /// the appropriate index object.
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	47 ///
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	48 /// As noted in revlog.c, revision numbers are actually encoded in
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	49 /// 4 bytes, and are liberally converted to ints, whence the i32
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	50 #[derive(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	51 Debug,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	52 derive_more::Display,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	53 Clone,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	54 Copy,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	55 Hash,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	56 PartialEq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	57 Eq,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	58 PartialOrd,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	59 Ord,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	60 )]
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	61 pub struct UncheckedRevision(i32);
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	62
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	63 impl From<Revision> for UncheckedRevision {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	64 fn from(value: Revision) -> Self {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	65 Self(value)
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	66 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	67 }
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	68
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	69 /// Marker expressing the absence of a parent
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	70 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	71 /// 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	72 /// to be smaller than all existing revisions.
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	73 pub const NULL_REVISION: Revision = -1;
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	74
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	75 /// Same as `mercurial.node.wdirrev`
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	76 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	77 /// 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	78 /// 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	79 #[allow(clippy::unreadable_literal)]
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	80 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	81 UncheckedRevision(0x7fffffff);
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	82
46821 e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46431 diff changeset	83 pub const WORKING_DIRECTORY_HEX: &str =
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46431 diff changeset	84 "ffffffffffffffffffffffffffffffffffffffff";
e8ae91b1a63d rhg: raise wdir specific error for `hg debugdata` Pulkit Goyal <7895pulkit@gmail.com> parents: 46431 diff changeset	85
44005 6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	86 /// 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	87 pub trait Graph {
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	88 /// Return the two parents of the given `Revision`.
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	89 ///
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	90 /// 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	91 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	92 }
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	93
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	94 #[derive(Clone, Debug, PartialEq)]
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	95 pub enum GraphError {
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	96 ParentOutOfRange(Revision),
6b332c1fc7fe rust-core: extracted a revlog submodule Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	97 }
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	98
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	99 /// The Mercurial Revlog Index
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	100 ///
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	101 /// 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	102 /// 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	103 pub trait RevlogIndex {
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	104 /// 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	105 fn len(&self) -> usize;
3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	106
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	107 fn is_empty(&self) -> bool {
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	108 self.len() == 0
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	109 }
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44182 diff changeset	110
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	111 /// 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	112 fn node(&self, rev: Revision) -> Option<&Node>;
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	113
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	114 /// Return a [`Revision`] if `rev` is a valid revision number for this
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	115 /// index
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	116 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	117 let rev = rev.0;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	118
50971 c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	119 if rev == NULL_REVISION \|\| (rev >= 0 && (rev as usize) < self.len()) {
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	120 Some(rev)
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	121 } else {
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	122 None
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	123 }
c950fdba7472 rust: add `UncheckedRevision` type Rapha?l Gom?s <rgomes@octobus.net> parents: 50743 diff changeset	124 }
44181 3fb39dc2e356 rust-revlog: a trait for the revlog index Georges Racinet <georges.racinet@octobus.net> parents: 44143 diff changeset	125 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	126
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	127 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	128 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	129 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	130 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	131
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	132 // 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	133 // 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	134 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	135 \| REVISION_FLAG_ELLIPSIS
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	136 \| REVISION_FLAG_EXTSTORED
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	137 \| REVISION_FLAG_HASCOPIESINFO;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	138
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	139 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	140
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	141 #[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	142 pub enum RevlogError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	143 InvalidRevision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	144 /// 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	145 WDirUnsupported,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	146 /// 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	147 AmbiguousPrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	148 #[from]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	149 Other(HgError),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	150 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	151
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	152 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	153 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	154 match error {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	155 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	156 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	157 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	158 ),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	159 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	160 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	161 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	162
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	163 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	164 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	165 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	166
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	167 impl RevlogError {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	168 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	169 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	170 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	171 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	172
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	173 /// 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	174 pub struct Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	175 /// 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	176 /// 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	177 /// data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	178 index: Index,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	179 /// 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	180 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	181 /// 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	182 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	183 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	184
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	185 impl Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	186 /// 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	187 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	188 /// 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	189 /// interleaved.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	190 pub fn open(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	191 store_vfs: &Vfs,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	192 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	193 data_path: Option<&Path>,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	194 use_nodemap: bool,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	195 ) -> Result<Self, HgError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	196 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	197 let index = {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	198 match store_vfs.mmap_open_opt(&index_path)? {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	199 None => Index::new(Box::new(vec![])),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	200 Some(index_mmap) => {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	201 let index = Index::new(Box::new(index_mmap))?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	202 Ok(index)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	203 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	204 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	205 }?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	206
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	207 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	208
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	209 // type annotation required
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	210 // 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	211 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	212 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	213 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	214 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	215 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	216 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	217 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	218 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	219
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	220 let nodemap = if index.is_inline() \|\| !use_nodemap {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	221 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	222 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	223 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	224 \|(docket, data)\| {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	225 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	226 Box::new(data),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	227 docket.data_length,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	228 )
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 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	232
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	233 Ok(Revlog {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	234 index,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	235 data_bytes,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	236 nodemap,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	237 })
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	238 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	239
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	240 /// 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	241 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	242 self.index.len()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	243 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	244
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	245 /// 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	246 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	247 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	248 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	249
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	250 /// 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	251 /// revlog
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	252 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	253 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	254 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	255 }
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	256 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	257 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	258 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	259
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	260 /// 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	261 /// revlog
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	262 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	263 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	264 node: NodePrefix,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	265 ) -> Result<Revision, RevlogError> {
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	266 let looked_up = if let Some(nodemap) = &self.nodemap {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	267 nodemap
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	268 .find_bin(&self.index, node)?
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	269 .ok_or(RevlogError::InvalidRevision)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	270 } else {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	271 self.rev_from_node_no_persistent_nodemap(node)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	272 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	273
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	274 if node.is_prefix_of(&NULL_NODE) {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	275 return match looked_up {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	276 Ok(_) => Err(RevlogError::AmbiguousPrefix),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	277 Err(RevlogError::InvalidRevision) => Ok(NULL_REVISION),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	278 res => res,
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	279 };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	280 };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	281
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	282 looked_up
50740 0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	283 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	284
50740 0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	285 /// 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	286 ///
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	287 /// 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	288 /// 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	289 /// 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	290 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	291 &self,
0159b014f3ab rust-revlog: split out method for `rev_from_node` without persistent nodemap Georges Racinet <georges.racinet@octobus.net> parents: 50505 diff changeset	292 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	293 ) -> 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	294 // 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	295 // 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	296 // optimize these cases.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	297 let mut found_by_prefix = None;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	298 for rev in (0..self.len() as Revision).rev() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	299 let index_entry = self.index.get_entry(rev).ok_or_else(\|\| {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	300 HgError::corrupted(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	301 "revlog references a revision not in the index",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	302 )
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	303 })?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	304 if node == *index_entry.hash() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	305 return Ok(rev);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	306 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	307 if node.is_prefix_of(index_entry.hash()) {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	308 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	309 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	310 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	311 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	312 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	313 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	314 found_by_prefix.ok_or(RevlogError::InvalidRevision)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	315 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	316
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	317 /// 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	318 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	319 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	320 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	321
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	322 /// 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	323 ///
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	324 /// 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	325 /// 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	326 /// 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	327 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	328 &self,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	329 rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	330 ) -> Result<Cow<[u8]>, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	331 if rev == NULL_REVISION.into() {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	332 return Ok(Cow::Borrowed(&[]));
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	333 };
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	334 self.get_entry(rev)?.data()
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	335 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	336
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	337 /// [`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	338 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	339 &self,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	340 rev: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	341 ) -> 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	342 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	343 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	344 };
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	345 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	346 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	347
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	348 /// 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	349 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	350 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	351 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	352 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	353 expected: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	354 data: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	355 ) -> bool {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	356 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	357 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	358 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	359 None => &NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	360 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	361 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	362 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	363 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	364 None => &NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	365 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	366
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	367 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	368 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	369
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	370 /// 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	371 /// and its deltas.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	372 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	373 snapshot: RevlogEntry,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	374 deltas: &[RevlogEntry],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	375 ) -> 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	376 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	377 let deltas = deltas
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	378 .iter()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	379 .rev()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	380 .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	381 .collect::<Result<Vec<_>, _>>()?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	382 let patches: Vec<_> =
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	383 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	384 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	385 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	386 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	387
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	388 /// 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	389 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	390 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	391 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	392 None => panic!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	393 "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	394 ),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	395 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	396 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	397
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	398 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	399 RevlogEntry {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	400 revlog: self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	401 rev: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	402 bytes: b"",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	403 compressed_len: 0,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	404 uncompressed_len: 0,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	405 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	406 p1: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	407 p2: NULL_REVISION,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	408 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	409 hash: NULL_NODE,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	410 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	411 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	412
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	413 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	414 &self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	415 rev: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	416 ) -> Result<RevlogEntry, RevlogError> {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	417 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	418 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	419 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	420 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	421 .index
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	422 .get_entry(rev)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	423 .ok_or(RevlogError::InvalidRevision)?;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	424 let start = index_entry.offset();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	425 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	426 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	427 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	428 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	429 &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	430 };
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	431 let base_rev = self
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	432 .index
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	433 .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	434 .ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	435 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	436 "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	437 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	438 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	439 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	440 let p1 =
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	441 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	442 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	443 "p1 for rev {} is invalid",
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	444 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	445 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	446 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	447 let p2 =
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	448 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	449 RevlogError::corrupted(format!(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	450 "p2 for rev {} is invalid",
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	451 rev
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	452 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	453 })?;
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	454 let entry = RevlogEntry {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	455 revlog: self,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	456 rev,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	457 bytes: data,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	458 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	459 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	460 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	461 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	462 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	463 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	464 },
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	465 p1,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	466 p2,
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	467 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	468 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	469 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	470 Ok(entry)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	471 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	472
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	473 /// 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	474 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	475 &self,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	476 rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	477 ) -> Result<RevlogEntry, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	478 if rev == NULL_REVISION.into() {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	479 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	480 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	481 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	482 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	483 })?;
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	484 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	485 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	486 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	487
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	488 /// 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	489 /// 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	490 #[derive(Clone)]
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	491 pub struct RevlogEntry<'revlog> {
7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	492 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	493 rev: Revision,
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	494 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	495 compressed_len: u32,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	496 uncompressed_len: i32,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	497 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	498 p1: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	499 p2: Revision,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	500 flags: u16,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	501 hash: Node,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	502 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	503
50503 74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	504 thread_local! {
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	505 // 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	506 // 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	507 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	508 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	509 }
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	510
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	511 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	512 bytes: &[u8],
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	513 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	514 ) -> 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	515 ZSTD_DECODER
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	516 .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	517 }
74d8a1b03960 rust: speed up zstd decompression by re-using the decompression context Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50410 diff changeset	518
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	519 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	520 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	521 self.rev
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	522 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	523
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	524 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	525 &self.hash
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	526 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	527
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	528 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	529 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	530 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	531
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	532 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	533 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	534 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	535
50410 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	536 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	537 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	538 ) -> 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	539 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	540 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	541 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	542 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	543 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	544 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	545
50410 c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	546 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	547 &self,
c101e7757ed7 rust-revlog: fix lifetime problem for RevlogEntry parent entries accessors Georges Racinet <georges.racinet@octobus.net> parents: 50409 diff changeset	548 ) -> 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	549 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	550 Ok(None)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	551 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	552 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	553 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	554 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	555
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	556 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	557 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	558 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	559 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	560 Some(self.p1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	561 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	562 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	563
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	564 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	565 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	566 None
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	567 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	568 Some(self.p2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	569 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	570 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	571
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	572 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	573 (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	574 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	575
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	576 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	577 // 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	578 // 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	579 (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	580 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	581
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	582 /// 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	583 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	584 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	585 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	586
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	587 // 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	588 // 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	589 // `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	590 // [_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	591 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	592 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	593 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	594 delta_chain.push(entry);
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	595 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	596 } else {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	597 let base_rev = UncheckedRevision(entry.rev - 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	598 delta_chain.push(entry);
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	599 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	600 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	601 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	602
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	603 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	604 entry.data_chunk()?
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	605 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	606 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	607 };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	608
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	609 Ok(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	610 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	611
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	612 fn check_data(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	613 &self,
50409 7ef51fff2c4f rust-revlog: explicit naming for `RevlogEntry` lifetime Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	614 data: Cow<'revlog, [u8]>,
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	615 ) -> 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	616 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	617 self.p1,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	618 self.p2,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	619 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	620 &data,
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	621 ) {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	622 Ok(data)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	623 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	624 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	625 return Err(HgError::unsupported(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	626 "ellipsis revisions are not supported by rhg",
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	627 )
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	628 .into());
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	629 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	630 Err(corrupted(format!(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	631 "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	632 self.rev
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	633 ))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	634 .into())
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	635 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	636 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	637
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	638 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	639 let data = self.rawdata()?;
50743 124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	640 if self.rev == NULL_REVISION {
124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	641 return Ok(data);
124c44b5cfad rust-revlog: fix RevlogEntry.data() for NULL_REVISION Georges Racinet <georges.racinet@octobus.net> parents: 50742 diff changeset	642 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	643 if self.is_censored() {
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	644 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	645 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	646 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	647 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	648
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	649 /// 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	650 /// 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	651 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	652 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	653 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	654 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	655 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	656 // 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	657 // header.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	658 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	659 // 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	660 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	661 // 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	662 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	663 // zstd data.
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	664 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	665 // 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	666 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	667 "unknown compression header '{}'",
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	668 format_type
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	669 ))),
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	670 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	671 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	672
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	673 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	674 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	675 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	676 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	677 decoder
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	678 .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	679 .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	680 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	681 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	682 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	683 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	684 decoder
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	685 .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	686 .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	687 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	688 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	689 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	690
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	691 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	692 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	693 if self.is_delta() {
50505 39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	694 // [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	695 // 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	696 // in the size of the delta.
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	697 // 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	698 // 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	699 // 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	700 // 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	701 let mut buf = Vec::with_capacity(cap);
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	702 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	703 Ok(_) => buf.shrink_to_fit(),
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	704 Err(_) => {
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	705 buf.clear();
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	706 zstd::stream::copy_decode(self.bytes, &mut buf)
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	707 .map_err(\|e\| corrupted(e.to_string()))?;
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	708 }
39ed7b2953bb rust: mostly avoid streaming zstd decompression Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50504 diff changeset	709 };
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	710 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	711 } else {
50504 d1cab48354bc rust: in zstd decompression, avoid a useless vec initialization Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50503 diff changeset	712 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	713 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	714 .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	715 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	716 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	717 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	718 Ok(buf)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	719 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	720 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	721 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	722
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	723 /// 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	724 /// (influences on decompression).
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	725 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	726 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	727 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	728 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	729
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	730 /// 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	731 fn hash(
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	732 data: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	733 p1_hash: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	734 p2_hash: &[u8],
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	735 ) -> [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	736 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	737 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	738 if a > b {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	739 hasher.update(b);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	740 hasher.update(a);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	741 } else {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	742 hasher.update(a);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	743 hasher.update(b);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	744 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	745 hasher.update(data);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	746 *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	747 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	748
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	749 #[cfg(test)]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	750 mod tests {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	751 use super::*;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	752 use crate::index::{IndexEntryBuilder, INDEX_ENTRY_SIZE};
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	753 use itertools::Itertools;
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 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	756 fn test_empty() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	757 let temp = tempfile::tempdir().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	758 let vfs = Vfs { base: temp.path() };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	759 std::fs::write(temp.path().join("foo.i"), b"").unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	760 let revlog = Revlog::open(&vfs, "foo.i", None, false).unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	761 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	762 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	763 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	764 assert!(!revlog.has_rev(0.into()));
50742 3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	765 assert_eq!(
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	766 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	767 NULL_REVISION
3338c6ffdaa3 rust-revlog: using constant in test Georges Racinet <georges.racinet@octobus.net> parents: 50741 diff changeset	768 );
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	769 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	770 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	771 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	772 }
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	773
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	774 #[test]
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	775 fn test_inline() {
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	776 let temp = tempfile::tempdir().unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	777 let vfs = Vfs { base: temp.path() };
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	778 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	779 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	780 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	781 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	782 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	783 .unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	784 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	785 .is_first(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	786 .with_version(1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	787 .with_inline(true)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	788 .with_offset(INDEX_ENTRY_SIZE)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	789 .with_node(node0)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	790 .build();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	791 let entry1_bytes = IndexEntryBuilder::new()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	792 .with_offset(INDEX_ENTRY_SIZE)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	793 .with_node(node1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	794 .build();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	795 let entry2_bytes = IndexEntryBuilder::new()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	796 .with_offset(INDEX_ENTRY_SIZE)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	797 .with_p1(0)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	798 .with_p2(1)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	799 .with_node(node2)
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	800 .build();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	801 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	802 .into_iter()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	803 .flatten()
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	804 .collect_vec();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	805 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	806 let revlog = Revlog::open(&vfs, "foo.i", None, false).unwrap();
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	807
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	808 let entry0 = revlog.get_entry(0.into()).ok().unwrap();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	809 assert_eq!(entry0.revision(), 0);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	810 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	811 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	812 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	813 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	814 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	815 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	816 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	817 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	818
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	819 let entry1 = revlog.get_entry(1.into()).ok().unwrap();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	820 assert_eq!(entry1.revision(), 1);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	821 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	822 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	823 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	824 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	825 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	826 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	827 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	828 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	829
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50973 diff changeset	830 let entry2 = revlog.get_entry(2.into()).ok().unwrap();
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	831 assert_eq!(entry2.revision(), 2);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	832 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	833 assert!(entry2.has_p1());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	834 assert_eq!(entry2.p1(), Some(0));
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	835 assert_eq!(entry2.p2(), Some(1));
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	836 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	837 assert!(p1_entry.is_some());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	838 assert_eq!(p1_entry.unwrap().revision(), 0);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	839 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	840 assert!(p2_entry.is_some());
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	841 assert_eq!(p2_entry.unwrap().revision(), 1);
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	842 }
50741 bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	843
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	844 #[test]
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	845 fn test_nodemap() {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	846 let temp = tempfile::tempdir().unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	847 let vfs = Vfs { base: temp.path() };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	848
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	849 // 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	850 // 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	851 // 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	852 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	853 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	854 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	855 .unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	856 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	857 .is_first(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	858 .with_version(1)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	859 .with_inline(true)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	860 .with_offset(INDEX_ENTRY_SIZE)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	861 .with_node(node0)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	862 .build();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	863 let entry1_bytes = IndexEntryBuilder::new()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	864 .with_offset(INDEX_ENTRY_SIZE)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	865 .with_node(node1)
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	866 .build();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	867 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	868 .into_iter()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	869 .flatten()
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	870 .collect_vec();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	871 std::fs::write(temp.path().join("foo.i"), contents).unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	872 let revlog = Revlog::open(&vfs, "foo.i", None, false).unwrap();
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	873
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	874 // 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	875 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	876
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	877 assert_eq!(revlog.rev_from_node(NULL_NODE.into()).unwrap(), -1);
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	878 assert_eq!(revlog.rev_from_node(node0.into()).unwrap(), 0);
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	879 assert_eq!(revlog.rev_from_node(node1.into()).unwrap(), 1);
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	880 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	881 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	882 .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	883 .unwrap(),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	884 -1
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	885 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	886 assert_eq!(
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	887 revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	888 .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	889 .unwrap(),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	890 1
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	891 );
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	892 // 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	893 // (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	894 match revlog
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	895 .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	896 .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	897 {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	898 RevlogError::AmbiguousPrefix => (),
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	899 e => {
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	900 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	901 }
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	902 };
bca4037306da rust-revlog: fix incorrect results with NULL_NODE prefixes Georges Racinet <georges.racinet@octobus.net> parents: 50740 diff changeset	903 }
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 47961 diff changeset	904 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/revlog/mod.rs @ 50974:1928b770e3e7