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

annotate rust/hg-core/src/revlog/changelog.rs @ 50408:841b13e6e84c

rust-changelog: introducing an intermediate `ChangelogEntry` Before this change, client code needing to extract, e.g, the Node ID and the description from a changeset had no other choice than calling both `entry_for_rev()` and `data_for_rev()`. This duplicates some (limited) computation, and more importantly imposes bad hygiene for client code: at some point of developement, the client code would have to pass over both entry and data in its internal layers, which at some point of development would raise the question whether they are consistent. We introduce the intermediate `ChangelogEntry` from which both conversion to the generic `RevlogEntry` and extraction of `ChangelogRevisionData` are possible. It might grow some convenience methods in the future. We keep the `data_for_rev()` method of `Changelog` for compatibility, pointing users at the more powerful alternative.

author	Georges Racinet <georges.racinet@octobus.net>
date	Wed, 29 Mar 2023 20:50:42 +0200
parents	b5dd6d6d6fa6
children	071a6c1d291e

rev	line source
46443 43d63979a75e rust: use HgError in RevlogError and Vfs Simon Sapin <simon.sapin@octobus.net> parents: 46433 diff changeset	1 use crate::errors::HgError;
46744 b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	2 use crate::revlog::{Node, NodePrefix};
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	3 use crate::revlog::{Revision, NULL_REVISION};
49937 750409505286 rust-clippy: merge "revlog" module definition and struct implementation Rapha?l Gom?s <rgomes@octobus.net> parents: 49930 diff changeset	4 use crate::revlog::{Revlog, RevlogEntry, RevlogError};
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	5 use crate::utils::hg_path::HgPath;
49090 a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49089 diff changeset	6 use crate::vfs::Vfs;
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	7 use itertools::Itertools;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	8 use std::ascii::escape_default;
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	9 use std::borrow::Cow;
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	10 use std::fmt::{Debug, Formatter};
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	11
50406 b47a9316050a rust-changelog: made doc-comments more consistent Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	12 /// A specialized `Revlog` to work with changelog data format.
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	13 pub struct Changelog {
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	14 /// The generic `revlog` format.
46433 4b381dbbf8b7 rhg: centralize parsing of `--rev` CLI arguments Simon Sapin <simon.sapin@octobus.net> parents: 46431 diff changeset	15 pub(crate) revlog: Revlog,
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	16 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	17
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	18 impl Changelog {
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	19 /// Open the `changelog` of a repository given by its root.
49090 a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49089 diff changeset	20 pub fn open(store_vfs: &Vfs, use_nodemap: bool) -> Result<Self, HgError> {
a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49089 diff changeset	21 let revlog =
a5ef50becea8 rust-revlog: make `Changelog` and `ManifestLog` unaware of `Repo` Martin von Zweigbergk <martinvonz@google.com> parents: 49089 diff changeset	22 Revlog::open(store_vfs, "00changelog.i", None, use_nodemap)?;
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	23 Ok(Self { revlog })
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	24 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	25
50406 b47a9316050a rust-changelog: made doc-comments more consistent Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	26 /// Return the `ChangelogRevisionData` for the given node ID.
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47968 diff changeset	27 pub fn data_for_node(
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	28 &self,
46431 645ee7225fab rust: Make NodePrefix allocation-free and Copy, remove NodePrefixRef Simon Sapin <simon.sapin@octobus.net> parents: 46167 diff changeset	29 node: NodePrefix,
48540 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48198 diff changeset	30 ) -> Result<ChangelogRevisionData, RevlogError> {
47968 6f579618ea7b rust: Rename the `Revlog::get_node_rev` method to `rev_from_node` Simon Sapin <simon.sapin@octobus.net> parents: 47967 diff changeset	31 let rev = self.revlog.rev_from_node(node)?;
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47968 diff changeset	32 self.data_for_rev(rev)
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	33 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	34
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	35 /// Return the [`ChangelogEntry`] for the given revision number.
49065 5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	36 pub fn entry_for_rev(
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	37 &self,
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	38 rev: Revision,
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	39 ) -> Result<ChangelogEntry, RevlogError> {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	40 let revlog_entry = self.revlog.get_entry(rev)?;
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	41 Ok(ChangelogEntry { revlog_entry })
49065 5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	42 }
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	43
50406 b47a9316050a rust-changelog: made doc-comments more consistent Georges Racinet <georges.racinet@octobus.net> parents: 49937 diff changeset	44 /// Return the [`ChangelogRevisionData`] for the given revision number.
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	45 ///
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	46 /// This is a useful shortcut in case the caller does not need the
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	47 /// generic revlog information (parents, hashes etc). Otherwise
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	48 /// consider taking a [`ChangelogEntry`] with
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	49 /// [entry_for_rev](`Self::entry_for_rev`) and doing everything from there.
47969 87e3f878e65f rust: Rename get_node methods to data_for_node, get_rev to data_for_rev Simon Sapin <simon.sapin@octobus.net> parents: 47968 diff changeset	50 pub fn data_for_rev(
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	51 &self,
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	52 rev: Revision,
48540 20d0d896183e rhg: Rename some revlog-related types and methods Simon Sapin <simon.sapin@octobus.net> parents: 48198 diff changeset	53 ) -> Result<ChangelogRevisionData, RevlogError> {
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	54 if rev == NULL_REVISION {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	55 return Ok(ChangelogRevisionData::null());
49063 cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	56 }
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	57 self.entry_for_rev(rev)?.data()
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	58 }
46744 b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	59
b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	60 pub fn node_from_rev(&self, rev: Revision) -> Option<&Node> {
47967 6c653d9d41b8 rust: Make private the `index` field of the `Revlog` struct Simon Sapin <simon.sapin@octobus.net> parents: 47964 diff changeset	61 self.revlog.node_from_rev(rev)
46744 b1f2c2b336ec rhg: `cat` command: print error messages for missing files Simon Sapin <simon.sapin@octobus.net> parents: 46443 diff changeset	62 }
49065 5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	63
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	64 pub fn rev_from_node(
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	65 &self,
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	66 node: NodePrefix,
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	67 ) -> Result<Revision, RevlogError> {
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	68 self.revlog.rev_from_node(node)
5d205e476057 rust-revlog: add methods for getting parent revs and entries Martin von Zweigbergk <martinvonz@google.com> parents: 49064 diff changeset	69 }
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	70 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	71
50408 841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	72 /// A specialized `RevlogEntry` for `changelog` data format
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	73 ///
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	74 /// This is a `RevlogEntry` with the added semantics that the associated
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	75 /// data should meet the requirements for `changelog`, materialized by
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	76 /// the fact that `data()` constructs a `ChangelogRevisionData`.
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	77 /// In case that promise would be broken, the `data` method returns an error.
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	78 #[derive(Clone)]
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	79 pub struct ChangelogEntry<'changelog> {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	80 /// Same data, as a generic `RevlogEntry`.
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	81 pub(crate) revlog_entry: RevlogEntry<'changelog>,
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	82 }
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	83
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	84 impl<'changelog> ChangelogEntry<'changelog> {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	85 pub fn data<'a>(
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	86 &'a self,
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	87 ) -> Result<ChangelogRevisionData<'changelog>, RevlogError> {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	88 let bytes = self.revlog_entry.data()?;
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	89 if bytes.is_empty() {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	90 Ok(ChangelogRevisionData::null())
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	91 } else {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	92 Ok(ChangelogRevisionData::new(bytes).map_err(\|err\| {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	93 RevlogError::Other(HgError::CorruptedRepository(format!(
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	94 "Invalid changelog data for revision {}: {:?}",
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	95 self.revlog_entry.revision(),
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	96 err
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	97 )))
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	98 })?)
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	99 }
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	100 }
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	101
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	102 /// Obtain a reference to the underlying `RevlogEntry`.
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	103 ///
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	104 /// This allows the caller to access the information that is common
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	105 /// to all revlog entries: revision number, node id, parent revisions etc.
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	106 pub fn as_revlog_entry(&self) -> &RevlogEntry {
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	107 &self.revlog_entry
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	108 }
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	109 }
841b13e6e84c rust-changelog: introducing an intermediate `ChangelogEntry` Georges Racinet <georges.racinet@octobus.net> parents: 50407 diff changeset	110
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	111 /// `Changelog` entry which knows how to interpret the `changelog` data bytes.
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	112 #[derive(PartialEq)]
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	113 pub struct ChangelogRevisionData<'changelog> {
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	114 /// The data bytes of the `changelog` entry.
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	115 bytes: Cow<'changelog, [u8]>,
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	116 /// The end offset for the hex manifest (not including the newline)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	117 manifest_end: usize,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	118 /// The end offset for the user+email (not including the newline)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	119 user_end: usize,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	120 /// The end offset for the timestamp+timezone+extras (not including the
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	121 /// newline)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	122 timestamp_end: usize,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	123 /// The end offset for the file list (not including the newline)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	124 files_end: usize,
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	125 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	126
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	127 impl<'changelog> ChangelogRevisionData<'changelog> {
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	128 fn new(bytes: Cow<'changelog, [u8]>) -> Result<Self, HgError> {
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	129 let mut line_iter = bytes.split(\|b\| b == &b'\n');
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	130 let manifest_end = line_iter
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	131 .next()
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	132 .expect("Empty iterator from split()?")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	133 .len();
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	134 let user_slice = line_iter.next().ok_or_else(\|\| {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	135 HgError::corrupted("Changeset data truncated after manifest line")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	136 })?;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	137 let user_end = manifest_end + 1 + user_slice.len();
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	138 let timestamp_slice = line_iter.next().ok_or_else(\|\| {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	139 HgError::corrupted("Changeset data truncated after user line")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	140 })?;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	141 let timestamp_end = user_end + 1 + timestamp_slice.len();
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	142 let mut files_end = timestamp_end + 1;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	143 loop {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	144 let line = line_iter.next().ok_or_else(\|\| {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	145 HgError::corrupted("Changeset data truncated in files list")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	146 })?;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	147 if line.is_empty() {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	148 if files_end == bytes.len() {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	149 // The list of files ended with a single newline (there
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	150 // should be two)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	151 return Err(HgError::corrupted(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	152 "Changeset data truncated after files list",
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	153 ));
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	154 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	155 files_end -= 1;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	156 break;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	157 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	158 files_end += line.len() + 1;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	159 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	160
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	161 Ok(Self {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	162 bytes,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	163 manifest_end,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	164 user_end,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	165 timestamp_end,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	166 files_end,
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	167 })
49063 cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	168 }
cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	169
cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	170 fn null() -> Self {
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	171 Self::new(Cow::Borrowed(
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	172 b"0000000000000000000000000000000000000000\n\n0 0\n\n",
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	173 ))
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	174 .unwrap()
49063 cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	175 }
cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	176
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	177 /// Return an iterator over the lines of the entry.
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	178 pub fn lines(&self) -> impl Iterator<Item = &[u8]> {
49062 fb82b5cb8301 rust-changelog: don't skip empty lines when iterating over changeset lines Martin von Zweigbergk <martinvonz@google.com> parents: 48541 diff changeset	179 self.bytes.split(\|b\| b == &b'\n')
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	180 }
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	181
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	182 /// Return the node id of the `manifest` referenced by this `changelog`
c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	183 /// entry.
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47963 diff changeset	184 pub fn manifest_node(&self) -> Result<Node, HgError> {
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	185 let manifest_node_hex = &self.bytes[..self.manifest_end];
49063 cc132255261b rust-changelog: remove special parsing of empty changelog data for null rev Martin von Zweigbergk <martinvonz@google.com> parents: 49062 diff changeset	186 Node::from_hex_for_repo(manifest_node_hex)
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	187 }
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	188
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	189 /// The full user string (usually a name followed by an email enclosed in
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	190 /// angle brackets)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	191 pub fn user(&self) -> &[u8] {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	192 &self.bytes[self.manifest_end + 1..self.user_end]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	193 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	194
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	195 /// The full timestamp line (timestamp in seconds, offset in seconds, and
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	196 /// possibly extras)
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	197 // TODO: We should expose this in a more useful way
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	198 pub fn timestamp_line(&self) -> &[u8] {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	199 &self.bytes[self.user_end + 1..self.timestamp_end]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	200 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	201
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	202 /// The files changed in this revision.
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	203 pub fn files(&self) -> impl Iterator<Item = &HgPath> {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	204 self.bytes[self.timestamp_end + 1..self.files_end]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	205 .split(\|b\| b == &b'\n')
49930 e98fd81bb151 rust-clippy: fix most warnings in `hg-core` Rapha?l Gom?s <rgomes@octobus.net> parents: 49096 diff changeset	206 .map(HgPath::new)
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	207 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	208
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	209 /// The change description.
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	210 pub fn description(&self) -> &[u8] {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	211 &self.bytes[self.files_end + 2..]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	212 }
45532 c2317b7624fd hg-core: add `Changlog` a specialized `Revlog` Antoine Cezar <antoine.cezar@octobus.net> parents: diff changeset	213 }
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	214
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	215 impl Debug for ChangelogRevisionData<'_> {
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	216 fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	217 f.debug_struct("ChangelogRevisionData")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	218 .field("bytes", &debug_bytes(&self.bytes))
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	219 .field("manifest", &debug_bytes(&self.bytes[..self.manifest_end]))
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	220 .field(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	221 "user",
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	222 &debug_bytes(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	223 &self.bytes[self.manifest_end + 1..self.user_end],
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	224 ),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	225 )
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	226 .field(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	227 "timestamp",
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	228 &debug_bytes(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	229 &self.bytes[self.user_end + 1..self.timestamp_end],
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	230 ),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	231 )
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	232 .field(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	233 "files",
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	234 &debug_bytes(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	235 &self.bytes[self.timestamp_end + 1..self.files_end],
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	236 ),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	237 )
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	238 .field(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	239 "description",
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	240 &debug_bytes(&self.bytes[self.files_end + 2..]),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	241 )
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	242 .finish()
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	243 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	244 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	245
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	246 fn debug_bytes(bytes: &[u8]) -> String {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	247 String::from_utf8_lossy(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	248 &bytes.iter().flat_map(\|b\| escape_default(*b)).collect_vec(),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	249 )
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	250 .to_string()
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	251 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	252
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	253 #[cfg(test)]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	254 mod tests {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	255 use super::*;
50407 b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	256 use crate::vfs::Vfs;
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	257 use crate::NULL_REVISION;
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	258 use pretty_assertions::assert_eq;
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	259
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	260 #[test]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	261 fn test_create_changelogrevisiondata_invalid() {
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	262 // Completely empty
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	263 assert!(ChangelogRevisionData::new(Cow::Borrowed(b"abcd")).is_err());
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	264 // No newline after manifest
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	265 assert!(ChangelogRevisionData::new(Cow::Borrowed(b"abcd")).is_err());
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	266 // No newline after user
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	267 assert!(ChangelogRevisionData::new(Cow::Borrowed(b"abcd\n")).is_err());
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	268 // No newline after timestamp
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	269 assert!(
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	270 ChangelogRevisionData::new(Cow::Borrowed(b"abcd\n\n0 0")).is_err()
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	271 );
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	272 // Missing newline after files
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	273 assert!(ChangelogRevisionData::new(Cow::Borrowed(
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	274 b"abcd\n\n0 0\nfile1\nfile2"
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	275 ))
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	276 .is_err(),);
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	277 // Only one newline after files
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	278 assert!(ChangelogRevisionData::new(Cow::Borrowed(
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	279 b"abcd\n\n0 0\nfile1\nfile2\n"
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	280 ))
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	281 .is_err(),);
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	282 }
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	283
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	284 #[test]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	285 fn test_create_changelogrevisiondata() {
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	286 let data = ChangelogRevisionData::new(Cow::Borrowed(
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	287 b"0123456789abcdef0123456789abcdef01234567
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	288 Some One <someone@example.com>
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	289 0 0
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	290 file1
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	291 file2
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	292
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	293 some
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	294 commit
49096 07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	295 message",
07ec9f4f24bf changelog: avoid copying changeset data into `ChangesetRevisionData` Martin von Zweigbergk <martinvonz@google.com> parents: 49090 diff changeset	296 ))
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	297 .unwrap();
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	298 assert_eq!(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	299 data.manifest_node().unwrap(),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	300 Node::from_hex("0123456789abcdef0123456789abcdef01234567")
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	301 .unwrap()
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	302 );
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	303 assert_eq!(data.user(), b"Some One <someone@example.com>");
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	304 assert_eq!(data.timestamp_line(), b"0 0");
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	305 assert_eq!(
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	306 data.files().collect_vec(),
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	307 vec![HgPath::new("file1"), HgPath::new("file2")]
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	308 );
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	309 assert_eq!(data.description(), b"some\ncommit\nmessage");
95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	310 }
50407 b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	311
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	312 #[test]
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	313 fn test_data_from_rev_null() -> Result<(), RevlogError> {
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	314 // an empty revlog will be enough for this case
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	315 let temp = tempfile::tempdir().unwrap();
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	316 let vfs = Vfs { base: temp.path() };
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	317 std::fs::write(temp.path().join("foo.i"), b"").unwrap();
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	318 let revlog = Revlog::open(&vfs, "foo.i", None, false).unwrap();
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	319
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	320 let changelog = Changelog { revlog };
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	321 assert_eq!(
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	322 changelog.data_for_rev(NULL_REVISION)?,
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	323 ChangelogRevisionData::null()
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	324 );
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	325 Ok(())
b5dd6d6d6fa6 rust-changelog: added a test for `NULL_REVISION` special case Georges Racinet <georges.racinet@octobus.net> parents: 50406 diff changeset	326 }
49064 95da3e99cbd8 rust-changelog: start parsing changeset data Martin von Zweigbergk <martinvonz@google.com> parents: 49063 diff changeset	327 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-core/src/revlog/changelog.rs @ 50408:841b13e6e84c