Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/revlog/mod.rs @ 52155:426696af24d3

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