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

annotate rust/hg-core/src/revlog/filelog.rs @ 52297:7be39c5110c9

hg-core: add a complete VFS This will be used from Python in a later change. More changes are needed in hg-core and rhg to properly clean up the APIs of the old VFS implementation but it can be done when the dust settles and we start adding more functionality to the pure Rust VFS.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 29 Jul 2024 20:47:43 +0200
parents	039b7caeb4d9
children	a3fa37bdb7ec

rev	line source
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	1 use crate::errors::HgError;
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	2 use crate::exit_codes;
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	3 use crate::repo::Repo;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	4 use crate::revlog::path_encode::path_encode;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	5 use crate::revlog::NodePrefix;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	6 use crate::revlog::Revision;
50010 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 50003 diff changeset	7 use crate::revlog::RevlogEntry;
750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 50003 diff changeset	8 use crate::revlog::{Revlog, RevlogError};
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	9 use crate::utils::files::get_path_from_bytes;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	10 use crate::utils::hg_path::HgPath;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	11 use crate::utils::SliceExt;
50989 27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	12 use crate::Graph;
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	13 use crate::GraphError;
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	14 use crate::UncheckedRevision;
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	15 use std::path::PathBuf;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	16
52286 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	17 use super::options::RevlogOpenOptions;
039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 51906 diff changeset	18
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	19 /// A specialized `Revlog` to work with file data logs.
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	20 pub struct Filelog {
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	21 /// The generic `revlog` format.
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	22 revlog: Revlog,
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	23 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	24
50989 27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	25 impl Graph for Filelog {
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	26 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: 50988 diff changeset	27 self.revlog.parents(rev)
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	28 }
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	29 }
27e773aa607d rust: implement the `Graph` trait for all revlogs Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	30
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	31 impl Filelog {
49522 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	32 pub fn open_vfs(
51906 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	33 store_vfs: &crate::vfs::VfsImpl,
49522 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	34 file_path: &HgPath,
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	35 options: RevlogOpenOptions,
49522 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	36 ) -> Result<Self, HgError> {
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	37 let index_path = store_path(file_path, b".i");
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	38 let data_path = store_path(file_path, b".d");
49522 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	39 let revlog =
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	40 Revlog::open(store_vfs, index_path, Some(&data_path), options)?;
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	41 Ok(Self { revlog })
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	42 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	43
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	44 pub fn open(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	45 repo: &Repo,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	46 file_path: &HgPath,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	47 options: RevlogOpenOptions,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	48 ) -> Result<Self, HgError> {
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 50989 diff changeset	49 Self::open_vfs(&repo.store_vfs(), file_path, options)
49522 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	50 }
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49209 diff changeset	51
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	52 /// The given node ID is that of the file as found in a filelog, not of a
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	53 /// changeset.
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47996 diff changeset	54 pub fn data_for_node(
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	55 &self,
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	56 file_node: impl Into<NodePrefix>,
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	57 ) -> Result<FilelogRevisionData, RevlogError> {
47996 6f579618ea7b rust: Rename the `Revlog::get_node_rev` method to `rev_from_node` Simon Sapin <simon.sapin@octobus.net> parents: 47991 diff changeset	58 let file_rev = self.revlog.rev_from_node(file_node.into())?;
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	59 self.data_for_rev(file_rev.into())
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	60 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	61
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	62 /// The given revision is that of the file as found in a filelog, not of a
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	63 /// changeset.
47997 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47996 diff changeset	64 pub fn data_for_rev(
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	65 &self,
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	66 file_rev: UncheckedRevision,
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	67 ) -> Result<FilelogRevisionData, RevlogError> {
48570 f2f57724d4eb rhg: Add RevlogEntry::data that does delta resolution Simon Sapin <simon.sapin@octobus.net> parents: 48569 diff changeset	68 let data: Vec<u8> = self.revlog.get_rev_data(file_rev)?.into_owned();
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49522 diff changeset	69 Ok(FilelogRevisionData(data))
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	70 }
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	71
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	72 /// The given node ID is that of the file as found in a filelog, not of a
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	73 /// changeset.
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	74 pub fn entry_for_node(
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	75 &self,
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	76 file_node: impl Into<NodePrefix>,
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	77 ) -> Result<FilelogEntry, RevlogError> {
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	78 let file_rev = self.revlog.rev_from_node(file_node.into())?;
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	79 self.entry_for_checked_rev(file_rev)
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	80 }
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	81
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	82 /// The given revision is that of the file as found in a filelog, not of a
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	83 /// changeset.
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	84 pub fn entry_for_rev(
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	85 &self,
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	86 file_rev: UncheckedRevision,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	87 ) -> Result<FilelogEntry, RevlogError> {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	88 Ok(FilelogEntry(self.revlog.get_entry(file_rev)?))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	89 }
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	90
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	91 fn entry_for_checked_rev(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	92 &self,
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	93 file_rev: Revision,
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	94 ) -> Result<FilelogEntry, RevlogError> {
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	95 Ok(FilelogEntry(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	96 self.revlog.get_entry_for_checked_rev(file_rev)?,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	97 ))
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	98 }
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	99 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	100
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	101 fn store_path(hg_path: &HgPath, suffix: &[u8]) -> PathBuf {
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	102 let encoded_bytes =
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	103 path_encode(&[b"data/", hg_path.as_bytes(), suffix].concat());
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	104 get_path_from_bytes(&encoded_bytes).into()
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	105 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	106
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	107 pub struct FilelogEntry<'a>(RevlogEntry<'a>);
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	108
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	109 impl FilelogEntry<'_> {
48575 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	110 /// `self.data()` can be expensive, with decompression and delta
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	111 /// resolution.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	112 ///
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	113 /// Without paying this cost, based on revlog index information
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	114 /// including `RevlogEntry::uncompressed_len`:
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	115 ///
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	116 /// * Returns `true` if the length that `self.data().file_data().len()`
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	117 /// would return is definitely not equal to `other_len`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	118 /// * Returns `false` if available information is inconclusive.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	119 pub fn file_data_len_not_equal_to(&self, other_len: u64) -> bool {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	120 // Relevant code that implement this behavior in Python code:
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	121 // basefilectx.cmp, filelog.size, storageutil.filerevisioncopied,
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	122 // revlog.size, revlog.rawsize
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	123
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	124 // Let’s call `file_data_len` what would be returned by
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	125 // `self.data().file_data().len()`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	126
49209 3f86ee422095 censor: make rhg fall back to python when encountering a censored node Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49144 diff changeset	127 if self.0.is_censored() {
48575 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	128 let file_data_len = 0;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	129 return other_len != file_data_len;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	130 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	131
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	132 if self.0.has_length_affecting_flag_processor() {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	133 // We can’t conclude anything about `file_data_len`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	134 return false;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	135 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	136
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	137 // Revlog revisions (usually) have metadata for the size of
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	138 // their data after decompression and delta resolution
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	139 // as would be returned by `Revlog::get_rev_data`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	140 //
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	141 // For filelogs this is the file’s contents preceded by an optional
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	142 // metadata block.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	143 let uncompressed_len = if let Some(l) = self.0.uncompressed_len() {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	144 l as u64
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	145 } else {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	146 // The field was set to -1, the actual uncompressed len is unknown.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	147 // We need to decompress to say more.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	148 return false;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	149 };
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	150 // `uncompressed_len = file_data_len + optional_metadata_len`,
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	151 // so `file_data_len <= uncompressed_len`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	152 if uncompressed_len < other_len {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	153 // Transitively, `file_data_len < other_len`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	154 // So `other_len != file_data_len` definitely.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	155 return true;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	156 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	157
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	158 if uncompressed_len == other_len + 4 {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	159 // It’s possible that `file_data_len == other_len` with an empty
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	160 // metadata block (2 start marker bytes + 2 end marker bytes).
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	161 // This happens when there wouldn’t otherwise be metadata, but
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	162 // the first 2 bytes of file data happen to match a start marker
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	163 // and would be ambiguous.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	164 return false;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	165 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	166
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	167 if !self.0.has_p1() {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	168 // There may or may not be copy metadata, so we can’t deduce more
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	169 // about `file_data_len` without computing file data.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	170 return false;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	171 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	172
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	173 // Filelog ancestry is not meaningful in the way changelog ancestry is.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	174 // It only provides hints to delta generation.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	175 // p1 and p2 are set to null when making a copy or rename since
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	176 // contents are likely unrelatedto what might have previously existed
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	177 // at the destination path.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	178 //
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	179 // Conversely, since here p1 is non-null, there is no copy metadata.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	180 // Note that this reasoning may be invalidated in the presence of
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	181 // merges made by some previous versions of Mercurial that
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	182 // swapped p1 and p2. See <https://bz.mercurial-scm.org/show_bug.cgi?id=6528>
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	183 // and `tests/test-issue6528.t`.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	184 //
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	185 // Since copy metadata is currently the only kind of metadata
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	186 // kept in revlog data of filelogs,
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	187 // this `FilelogEntry` does not have such metadata:
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	188 let file_data_len = uncompressed_len;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	189
50003 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49522 diff changeset	190 file_data_len != other_len
48575 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	191 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48571 diff changeset	192
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	193 pub fn data(&self) -> Result<FilelogRevisionData, HgError> {
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	194 let data = self.0.data();
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	195 match data {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	196 Ok(data) => Ok(FilelogRevisionData(data.into_owned())),
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	197 // Errors other than `HgError` should not happen at this point
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	198 Err(e) => match e {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	199 RevlogError::Other(hg_error) => Err(hg_error),
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	200 revlog_error => Err(HgError::abort(
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	201 revlog_error.to_string(),
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	202 exit_codes::ABORT,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	203 None,
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	204 )),
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	205 },
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 50010 diff changeset	206 }
48571 35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	207 }
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	208 }
35c47015b9b7 rhg: Expose FilelogEntry that wraps RevlogEntry Simon Sapin <simon.sapin@octobus.net> parents: 48570 diff changeset	209
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	210 /// The data for one revision in a filelog, uncompressed and delta-resolved.
20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	211 pub struct FilelogRevisionData(Vec<u8>);
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	212
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	213 impl FilelogRevisionData {
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	214 /// Split into metadata and data
48260 e9faae0f445c rhg: simplify split_metadata Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48249 diff changeset	215 pub fn split(&self) -> Result<(Option<&[u8]>, &[u8]), HgError> {
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	216 const DELIMITER: &[u8; 2] = &[b'\x01', b'\n'];
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	217
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	218 if let Some(rest) = self.0.drop_prefix(DELIMITER) {
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	219 if let Some((metadata, data)) = rest.split_2_by_slice(DELIMITER) {
48260 e9faae0f445c rhg: simplify split_metadata Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48249 diff changeset	220 Ok((Some(metadata), data))
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	221 } else {
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	222 Err(HgError::corrupted(
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	223 "Missing metadata end delimiter in filelog entry",
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	224 ))
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	225 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	226 } else {
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	227 Ok((None, &self.0))
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	228 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	229 }
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	230
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	231 /// Returns the file contents at this revision, stripped of any metadata
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	232 pub fn file_data(&self) -> Result<&[u8], HgError> {
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	233 let (_metadata, data) = self.split()?;
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	234 Ok(data)
4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	235 }
48249 027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	236
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	237 /// Consume the entry, and convert it into data, discarding any metadata,
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	238 /// if present.
48569 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48260 diff changeset	239 pub fn into_file_data(self) -> Result<Vec<u8>, HgError> {
48260 e9faae0f445c rhg: simplify split_metadata Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48249 diff changeset	240 if let (Some(_metadata), data) = self.split()? {
48249 027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	241 Ok(data.to_owned())
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	242 } else {
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	243 Ok(self.0)
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	244 }
027ebad952ac rhg: internally, return a structured representation from hg cat Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 47997 diff changeset	245 }
47989 4d2a5ca060e3 rust: Add a Filelog struct that wraps Revlog Simon Sapin <simon.sapin@octobus.net> parents: diff changeset	246 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/revlog/filelog.rs @ 52297:7be39c5110c9