mercurial: comparison rust/hg-core/src/dirstate_tree/on

equal deleted inserted replaced

-:e8ea403b1c46
+:288de6f5d724
 //! The "version 2" disk representation of the dirstate
 //!
 //! See `mercurial/helptext/internals/dirstate-v2.txt`
-use crate::dirstate::TruncatedTimestamp;
+use crate::dirstate::{DirstateV2Data, TruncatedTimestamp};
 use crate::dirstate_tree::dirstate_map::DirstateVersion;
 use crate::dirstate_tree::dirstate_map::{self, DirstateMap, NodeRef};
 use crate::dirstate_tree::path_with_basename::WithBasename;
 use crate::errors::HgError;
 use crate::utils::hg_path::HgPath;
 ignore_patterns_hash: IgnorePatternsHash,
 }
 /// Fields are documented in the *The data file format*
 /// section of `mercurial/helptext/internals/dirstate-v2.txt`
-#[derive(BytesCast)]
+#[derive(BytesCast, Debug)]
 #[repr(C)]
 pub(super) struct Node {
 full_path: PathSlice,
 /// In bytes from `self.full_path.start`
 const ALL_IGNORED_RECORDED = 1 <<15;
 }
 }
 /// Duration since the Unix epoch
-#[derive(BytesCast, Copy, Clone)]
+#[derive(BytesCast, Copy, Clone, Debug)]
 #[repr(C)]
 struct PackedTruncatedTimestamp {
 truncated_seconds: U32Be,
 nanoseconds: U32Be,
 }
 /// of either some other node or of the repository root.
 ///
 /// Always sorted by ascending `full_path`, to allow binary search.
 /// Since nodes with the same parent nodes also have the same parent path,
 /// only the `base_name`s need to be compared during binary search.
-#[derive(BytesCast, Copy, Clone)]
+#[derive(BytesCast, Copy, Clone, Debug)]
 #[repr(C)]
 struct ChildNodes {
 start: Offset,
 len: Size,
 }
 /// A `HgPath` of `len` bytes
-#[derive(BytesCast, Copy, Clone)]
+#[derive(BytesCast, Copy, Clone, Debug)]
 #[repr(C)]
 struct PathSlice {
 start: Offset,
 len: PathSize,
 }
 Ok(m)
 }
 fn assume_entry(&self) -> Result<DirstateEntry, DirstateV2ParseError> {
 // TODO: convert through raw bits instead?
-let wdir_tracked = self.flags().contains(Flags::WDIR_TRACKED);
+let wc_tracked = self.flags().contains(Flags::WDIR_TRACKED);
 let p1_tracked = self.flags().contains(Flags::P1_TRACKED);
 let p2_info = self.flags().contains(Flags::P2_INFO);
 let mode_size = if self.flags().contains(Flags::HAS_MODE_AND_SIZE)
 && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED)
 {
 if self.flags().contains(Flags::HAS_FALLBACK_SYMLINK) {
 Some(self.flags().contains(Flags::FALLBACK_SYMLINK))
 } else {
 None
 };
-Ok(DirstateEntry::from_v2_data(
+Ok(DirstateEntry::from_v2_data(DirstateV2Data {
-wdir_tracked,
+wc_tracked,
 p1_tracked,
 p2_info,
 mode_size,
 mtime,
 fallback_exec,
 fallback_symlink,
-))
+}))
 }
 pub(super) fn entry(
 &self,
 ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> {
 }
 fn from_dirstate_entry(
 entry: &DirstateEntry,
 ) -> (Flags, U32Be, PackedTruncatedTimestamp) {
-let (
+let DirstateV2Data {
-wdir_tracked,
+wc_tracked,
 p1_tracked,
 p2_info,
-mode_size_opt,
+mode_size: mode_size_opt,
-mtime_opt,
+mtime: mtime_opt,
 fallback_exec,
 fallback_symlink,
-) = entry.v2_data();
+} = entry.v2_data();
-// TODO: convert throug raw flag bits instead?
+// TODO: convert through raw flag bits instead?
 let mut flags = Flags::empty();
-flags.set(Flags::WDIR_TRACKED, wdir_tracked);
+flags.set(Flags::WDIR_TRACKED, wc_tracked);
 flags.set(Flags::P1_TRACKED, p1_tracked);
 flags.set(Flags::P2_INFO, p2_info);
 let size = if let Some((m, s)) = mode_size_opt {
 let exec_perm = m & (libc::S_IXUSR as u32) != 0;
 let is_symlink = m & (libc::S_IFMT as u32) == libc::S_IFLNK as u32;
 nodes: ChildNodes,
 f: &mut impl FnMut(&'on_disk HgPath),
 ) -> Result<(), DirstateV2ParseError> {
 for node in read_nodes(on_disk, nodes)? {
 if let Some(entry) = node.entry()? {
-if entry.state().is_tracked() {
+if entry.tracked() {
 f(node.full_path(on_disk)?)
 }
 }
 recur(on_disk, node.children, f)?
 }

branch	stable
changeset 49366	288de6f5d724
parent 49164	a932cad26d37
parent 49337	6cd249556e20
child 49373	f8ec7b16c98f