Mercurial > hg
view rust/hg-core/src/revlog/changelog.rs @ 48042:008959fcbfb2
rust: Align DirstateEntry internals with Python/C DirstateItem
This propagate to this Rust struct the similar change that was made recently
to the Python classe and C struct. Namely, instead of storing a four-valued
`state` field we now store seven (bit-packed) booleans that give lower-level
information.
Additionally, the marker values -1 and -2 for mtime and size should not
be used internally anymore. They are replaced by some combinations of booleans
For now, all uses of of `DirstateEntry` still use the compatibility APIs
with `state` and marker values. Later the Rust API for DirstateMap
will be increasingly updated to the new style.
Also change the expected result of the test_non_normal_other_parent_entries
unit test. Only a `DirstateEntry` with `size == -2 && mtime != -1` is
affected, but this case never occurs outside of unit tests.
`size == -2` was the marker value for "from other parent" entries,
where no meaningful mtime is stored.
Differential Revision: https://phab.mercurial-scm.org/D11484
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Mon, 20 Sep 2021 19:18:21 +0200 |
parents | 87e3f878e65f |
children | 61ce70fd420e |
line wrap: on
line source
use crate::errors::HgError; use crate::repo::Repo; use crate::revlog::revlog::{Revlog, RevlogError}; use crate::revlog::Revision; use crate::revlog::{Node, NodePrefix}; /// A specialized `Revlog` to work with `changelog` data format. pub struct Changelog { /// The generic `revlog` format. pub(crate) revlog: Revlog, } impl Changelog { /// Open the `changelog` of a repository given by its root. pub fn open(repo: &Repo) -> Result<Self, HgError> { let revlog = Revlog::open(repo, "00changelog.i", None)?; Ok(Self { revlog }) } /// Return the `ChangelogEntry` for the given node ID. pub fn data_for_node( &self, node: NodePrefix, ) -> Result<ChangelogEntry, RevlogError> { let rev = self.revlog.rev_from_node(node)?; self.data_for_rev(rev) } /// Return the `ChangelogEntry` of the given revision number. pub fn data_for_rev( &self, rev: Revision, ) -> Result<ChangelogEntry, RevlogError> { let bytes = self.revlog.get_rev_data(rev)?; Ok(ChangelogEntry { bytes }) } pub fn node_from_rev(&self, rev: Revision) -> Option<&Node> { self.revlog.node_from_rev(rev) } } /// `Changelog` entry which knows how to interpret the `changelog` data bytes. #[derive(Debug)] pub struct ChangelogEntry { /// The data bytes of the `changelog` entry. bytes: Vec<u8>, } impl ChangelogEntry { /// Return an iterator over the lines of the entry. pub fn lines(&self) -> impl Iterator<Item = &[u8]> { self.bytes .split(|b| b == &b'\n') .filter(|line| !line.is_empty()) } /// Return the node id of the `manifest` referenced by this `changelog` /// entry. pub fn manifest_node(&self) -> Result<Node, HgError> { Node::from_hex_for_repo( self.lines() .next() .ok_or_else(|| HgError::corrupted("empty changelog entry"))?, ) } }