This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9010

hg-core: add `Changlog` a specialized `Revlog`
ClosedPublic

Authored by acezar on Sep 11 2020, 3:52 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc2317b7624fd: hg-core: add `Changlog` a specialized `Revlog`
Summary

A facade to Revlog to provide a changelog specific interface.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

acezar created this revision.Sep 11 2020, 3:52 AM
Alphare accepted this revision.Sep 17 2020, 5:57 AM
Alphare added a subscriber: Alphare.

Minor nits, this looks good.

rust/hg-core/src/revlog/changelog.rs
39

/s/know/knows/

57

or_or(RevlogError::Corrupted) is shorter and has the same behavior.

acezar updated this revision to Diff 22718.Sep 18 2020, 9:08 AM
acezar marked 2 inline comments as done.Sep 18 2020, 9:10 AM
acezar added a commit: rHGc2317b7624fd: hg-core: add `Changlog` a specialized `Revlog`.Sep 23 2020, 10:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc2317b7624fd: hg-core: add `Changlog` a specialized `Revlog` (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22791

rust/hg-core/src/revlog.rs

// Copyright 2018-2020 Georges Racinet <georges.racinet@octobus.net> // Copyright 2018-2020 Georges Racinet <georges.racinet@octobus.net>
// and Mercurial contributors // and Mercurial contributors
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Mercurial concepts for handling revision history //! Mercurial concepts for handling revision history
pub mod node; pub mod node;
pub mod nodemap; pub mod nodemap;
pub use node::{Node, NodeError, NodePrefix, NodePrefixRef}; pub use node::{Node, NodeError, NodePrefix, NodePrefixRef};
pub mod changelog;
pub mod index; pub mod index;
pub mod patch; pub mod patch;
pub mod revlog; pub mod revlog;
/// Mercurial revision numbers /// Mercurial revision numbers
/// ///
/// As noted in revlog.c, revision numbers are actually encoded in /// As noted in revlog.c, revision numbers are actually encoded in
/// 4 bytes, and are liberally converted to ints, whence the i32 /// 4 bytes, and are liberally converted to ints, whence the i32

rust/hg-core/src/revlog/changelog.rs

  • This file was added.
use crate::revlog::revlog::{Revlog, RevlogError};
use crate::revlog::Revision;
use std::path::PathBuf;
/// A specialized `Revlog` to work with `changelog` data format.
pub struct Changelog {
/// The generic `revlog` format.
revlog: Revlog,
}
impl Changelog {
/// Open the `changelog` of a repository given by its root.
pub fn open(root: &PathBuf) -> Result<Self, RevlogError> {
let index_file = root.join(".hg/store/00changelog.i");
let revlog = Revlog::open(&index_file)?;
Ok(Self { revlog })
}
/// Return the `ChangelogEntry` a given node id.
pub fn get_node(
&self,
node: &[u8],
) -> Result<ChangelogEntry, RevlogError> {
let rev = self.revlog.get_node_rev(node)?;
self.get_rev(rev)
}
/// Return the `ChangelogEntry` of a given node revision.
pub fn get_rev(
&self,
rev: Revision,
) -> Result<ChangelogEntry, RevlogError> {
let bytes = self.revlog.get_rev_data(rev)?;
Ok(ChangelogEntry { bytes })
}
}
/// `Changelog` entry which knows how to interpret the `changelog` data bytes.
#[derive(Debug)]
AlphareUnsubmitted
Done

/s/know/knows/

Alphare: /s/know/knows/
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<&[u8], RevlogError> {
self.lines().next().ok_or(RevlogError::Corrupted)
}
AlphareUnsubmitted
Done

or_or(RevlogError::Corrupted) is shorter and has the same behavior.

Alphare: `or_or(RevlogError::Corrupted)` is shorter and has the same behavior.
}