##// END OF EJS Templates
rust: implement conversion of RevlogError into HgError...
rust: implement conversion of RevlogError into HgError The conversion already exists in rhg, where we need to convert to CommandError. This commit moves it to hg core. This makes it easier to code some middleware where we need to carry around a type that represents any type of hg error (HgError).

File last commit:

r53187:a3fa37bd default
r53241:09a36de5 default
Show More
manifest.rs
216 lines | 7.1 KiB | application/rls-services+xml | RustLexer
Raphaël Gomès
rust-manifest: encode flags as `Option<NonZeroU8>`...
r52930 use std::num::NonZeroU8;
Simon Sapin
rust: Return HgError instead of RevlogError in revlog constructors...
r48777 use crate::errors::HgError;
Simon Sapin
rhg: Reuse manifest when checking status of multiple ambiguous files...
r48778 use crate::revlog::{Node, NodePrefix};
Raphaël Gomès
rust-clippy: merge "revlog" module definition and struct implementation...
r50832 use crate::revlog::{Revlog, RevlogError};
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 use crate::utils::hg_path::HgPath;
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166 use crate::utils::SliceExt;
Raphaël Gomès
rust: add Vfs trait...
r52761 use crate::vfs::VfsImpl;
Raphaël Gomès
rust-revlog: introduce an `options` module...
r53053 use crate::{Graph, GraphError, Revision, UncheckedRevision};
use super::options::RevlogOpenOptions;
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104
/// A specialized `Revlog` to work with `manifest` data format.
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 pub struct Manifestlog {
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 /// The generic `revlog` format.
Raphaël Gomès
rust-revlog: teach the revlog opening code to read the repo options...
r52084 pub(crate) revlog: Revlog,
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 }
Raphaël Gomès
rust: implement the `Graph` trait for all revlogs...
r51871 impl Graph for Manifestlog {
fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
self.revlog.parents(rev)
}
}
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 impl Manifestlog {
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 /// Open the `manifest` of a repository given by its root.
Raphaël Gomès
rust-revlog: teach the revlog opening code to read the repo options...
r52084 pub fn open(
Raphaël Gomès
rust: add Vfs trait...
r52761 store_vfs: &VfsImpl,
Raphaël Gomès
rust-revlog: teach the revlog opening code to read the repo options...
r52084 options: RevlogOpenOptions,
) -> Result<Self, HgError> {
let revlog = Revlog::open(store_vfs, "00manifest.i", None, options)?;
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 Ok(Self { revlog })
}
Simon Sapin
rust: Rename get_node methods to data_for_node, get_rev to data_for_rev...
r48783 /// Return the `Manifest` for the given node ID.
///
/// Note: this is a node ID in the manifestlog, typically found through
/// `ChangelogEntry::manifest_node`. It is *not* the node ID of any
/// changeset.
///
/// See also `Repo::manifest_for_node`
pub fn data_for_node(
&self,
node: NodePrefix,
) -> Result<Manifest, RevlogError> {
Simon Sapin
rust: Rename the `Revlog::get_node_rev` method to `rev_from_node`...
r48782 let rev = self.revlog.rev_from_node(node)?;
Raphaël Gomès
rust: normalize `_for_unchecked_rev` naming among revlogs and the index...
r53187 self.data(rev)
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 }
Simon Sapin
rust: Rename get_node methods to data_for_node, get_rev to data_for_rev...
r48783 /// Return the `Manifest` of a given revision number.
///
/// Note: this is a revision number in the manifestlog, *not* of any
/// changeset.
///
/// See also `Repo::manifest_for_rev`
Raphaël Gomès
rust: normalize `_for_unchecked_rev` naming among revlogs and the index...
r53187 pub fn data_for_unchecked_rev(
Simon Sapin
rust: Rename get_node methods to data_for_node, get_rev to data_for_rev...
r48783 &self,
Raphaël Gomès
rust: use the new `UncheckedRevision` everywhere applicable...
r51870 rev: UncheckedRevision,
) -> Result<Manifest, RevlogError> {
Raphaël Gomès
rust: normalize `_for_unchecked_rev` naming among revlogs and the index...
r53187 let bytes = self.revlog.get_data_for_unchecked_rev(rev)?.into_owned();
Raphaël Gomès
rust: use the new `UncheckedRevision` everywhere applicable...
r51870 Ok(Manifest { bytes })
}
Raphaël Gomès
rust: normalize `_for_unchecked_rev` naming among revlogs and the index...
r53187 /// Same as [`Self::data_for_unchecked_rev`] for a checked [`Revision`]
pub fn data(&self, rev: Revision) -> Result<Manifest, RevlogError> {
let bytes = self.revlog.get_data(rev)?.into_owned();
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 Ok(Manifest { bytes })
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 }
}
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 /// `Manifestlog` entry which knows how to interpret the `manifest` data bytes.
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 #[derive(Debug)]
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 pub struct Manifest {
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 /// Format for a manifest: flat sequence of variable-size entries,
/// sorted by path, each as:
///
/// ```text
/// <path> \0 <hex_node_id> <flags> \n
/// ```
///
/// The last entry is also terminated by a newline character.
/// Flags is one of `b""` (the empty string), `b"x"`, `b"l"`, or `b"t"`.
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 bytes: Vec<u8>,
}
Simon Sapin
rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest...
r48771 impl Manifest {
Raphaël Gomès
rust-files: check for empty manifests caused by narrow...
r52941 /// Return a new empty manifest
pub fn empty() -> Self {
Self { bytes: vec![] }
}
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166 pub fn iter(
&self,
) -> impl Iterator<Item = Result<ManifestEntry, HgError>> {
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 self.bytes
.split(|b| b == &b'\n')
.filter(|line| !line.is_empty())
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 .map(ManifestEntry::from_raw)
Antoine Cezar
hg-core: add `files_with_nodes` to `Manifest`...
r46111 }
Simon Sapin
rhg: Reuse manifest when checking status of multiple ambiguous files...
r48778
/// If the given path is in this manifest, return its filelog node ID
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 pub fn find_by_path(
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166 &self,
path: &HgPath,
) -> Result<Option<ManifestEntry>, HgError> {
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 use std::cmp::Ordering::*;
let path = path.as_bytes();
// Both boundaries of this `&[u8]` slice are always at the boundary of
// an entry
let mut bytes = &*self.bytes;
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 // Binary search algorithm derived from `[T]::binary_search_by`
// <https://github.com/rust-lang/rust/blob/1.57.0/library/core/src/slice/mod.rs#L2221>
// except we don’t have a slice of entries. Instead we jump to the
// middle of the byte slice and look around for entry delimiters
// (newlines).
while let Some(entry_range) = Self::find_entry_near_middle_of(bytes)? {
let (entry_path, rest) =
ManifestEntry::split_path(&bytes[entry_range.clone()])?;
let cmp = entry_path.cmp(path);
if cmp == Less {
let after_newline = entry_range.end + 1;
bytes = &bytes[after_newline..];
} else if cmp == Greater {
bytes = &bytes[..entry_range.start];
} else {
return Ok(Some(ManifestEntry::from_path_and_rest(
entry_path, rest,
)));
Simon Sapin
rhg: Reuse manifest when checking status of multiple ambiguous files...
r48778 }
}
Ok(None)
}
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324
/// If there is at least one, return the byte range of an entry *excluding*
/// the final newline.
fn find_entry_near_middle_of(
bytes: &[u8],
) -> Result<Option<std::ops::Range<usize>>, HgError> {
let len = bytes.len();
if len > 0 {
let middle = bytes.len() / 2;
// Integer division rounds down, so `middle < len`.
let (before, after) = bytes.split_at(middle);
Raphaël Gomès
rust-manifest: use `memchr` crate for all byte-finding needs...
r53177 let entry_start = match memchr::memrchr(b'\n', before) {
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 Some(i) => i + 1,
None => 0, // We choose the first entry in `bytes`
};
Raphaël Gomès
rust-manifest: use `memchr` crate for all byte-finding needs...
r53177 let entry_end = match memchr::memchr(b'\n', after) {
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 Some(i) => {
// No `+ 1` here to exclude this newline from the range
middle + i
}
None => {
// In a well-formed manifest:
//
// * Since `len > 0`, `bytes` contains at least one entry
// * Every entry ends with a newline
// * Since `middle < len`, `after` contains at least the
// newline at the end of the last entry of `bytes`.
//
// We didn’t find a newline, so this manifest is not
// well-formed.
return Err(HgError::corrupted(
"manifest entry without \\n delimiter",
));
}
};
Ok(Some(entry_start..entry_end))
} else {
// len == 0
Ok(None)
}
}
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 }
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166
/// `Manifestlog` entry which knows how to interpret the `manifest` data bytes.
#[derive(Debug)]
pub struct ManifestEntry<'manifest> {
pub path: &'manifest HgPath,
pub hex_node_id: &'manifest [u8],
/// `Some` values are b'x', b'l', or 't'
Raphaël Gomès
rust-manifest: encode flags as `Option<NonZeroU8>`...
r52930 pub flags: Option<NonZeroU8>,
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166 }
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 impl<'a> ManifestEntry<'a> {
fn split_path(bytes: &[u8]) -> Result<(&[u8], &[u8]), HgError> {
bytes.split_2(b'\0').ok_or_else(|| {
HgError::corrupted("manifest entry without \\0 delimiter")
})
}
fn from_path_and_rest(path: &'a [u8], rest: &'a [u8]) -> Self {
let (hex_node_id, flags) = match rest.split_last() {
Some((&b'x', rest)) => (rest, Some(b'x')),
Some((&b'l', rest)) => (rest, Some(b'l')),
Some((&b't', rest)) => (rest, Some(b't')),
_ => (rest, None),
};
Self {
path: HgPath::new(path),
hex_node_id,
Raphaël Gomès
rust-manifest: encode flags as `Option<NonZeroU8>`...
r52930 flags: flags.map(|f| f.try_into().expect("invalid flag")),
Simon Sapin
rhg: Use binary search in manifest lookup...
r49324 }
}
fn from_raw(bytes: &'a [u8]) -> Result<Self, HgError> {
let (path, rest) = Self::split_path(bytes)?;
Ok(Self::from_path_and_rest(path, rest))
}
Simon Sapin
rhg: Also parse flags in the manifest parser...
r49166 pub fn node_id(&self) -> Result<Node, HgError> {
Node::from_hex_for_repo(self.hex_node_id)
}
}