Mercurial > hg-stable
changeset 48084:3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
This Rust trait used to exist in order to allow the DirstateMap class exposed
to Python to be backed by either of two implementations: one similar to the
Python implementation based on a "flat" `HashMap<HgPathBuf, DirstateEntry>`,
and the newer one based on a tree of nodes matching the directory structure
of tracked files. A boxed trait object was used with dynamic dispatch.
With the flat implementation removed and only the tree one remaining, this
abstraction is not useful anymore and the concrete type can be stored directly.
It remains that the trait was implemented separately for `DirstateMap<'_>`
(which takes a lifetime parameter) and `OwningDirstateMap` (whose job is to
wrap the former and hide the lifetime parameter), with the latter impl only
forwarding calls.
This changeset also removes this forwarding. Instead, the methods formerly of
the `DirstateMapMethods` trait are now inherent methods implemented for
`OwningDirstateMap` (where they will actually be used) but in the module that
defines `DirstateMap`. This unusual setup gives access to the private fields
of `DirstateMap` from those methods.
Differential Revision: https://phab.mercurial-scm.org/D11517
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Mon, 27 Sep 2021 13:52:49 +0200 |
| parents | bf8837e3d7ce |
| children | adb367f0e9a2 |
| files | rust/hg-core/src/dirstate_tree.rs rust/hg-core/src/dirstate_tree/dirstate_map.rs rust/hg-core/src/dirstate_tree/dispatch.rs rust/hg-core/src/dirstate_tree/owning.rs rust/hg-core/src/dirstate_tree/owning_dispatch.rs rust/hg-core/src/repo.rs rust/hg-cpython/src/dirstate/dirstate_map.rs rust/rhg/src/commands/status.rs |
| diffstat | 8 files changed, 113 insertions(+), 484 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/hg-core/src/dirstate_tree.rs Mon Sep 27 13:52:49 2021 +0200 @@ -1,7 +1,5 @@ pub mod dirstate_map; -pub mod dispatch; pub mod on_disk; pub mod owning; -mod owning_dispatch; pub mod path_with_basename; pub mod status;
--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs Mon Sep 27 13:52:49 2021 +0200 @@ -6,6 +6,7 @@ use super::on_disk; use super::on_disk::DirstateV2ParseError; +use super::owning::OwningDirstateMap; use super::path_with_basename::WithBasename; use crate::dirstate::parsers::pack_entry; use crate::dirstate::parsers::packed_entry_size; @@ -728,32 +729,35 @@ }) } -impl<'on_disk> super::dispatch::DirstateMapMethods for DirstateMap<'on_disk> { - fn clear(&mut self) { - self.root = Default::default(); - self.nodes_with_entry_count = 0; - self.nodes_with_copy_source_count = 0; +impl OwningDirstateMap { + pub fn clear(&mut self) { + let map = self.get_map_mut(); + map.root = Default::default(); + map.nodes_with_entry_count = 0; + map.nodes_with_copy_source_count = 0; } - fn set_entry( + pub fn set_entry( &mut self, filename: &HgPath, entry: DirstateEntry, ) -> Result<(), DirstateV2ParseError> { - self.get_or_insert(&filename)?.data = NodeData::Entry(entry); + let map = self.get_map_mut(); + map.get_or_insert(&filename)?.data = NodeData::Entry(entry); Ok(()) } - fn add_file( + pub fn add_file( &mut self, filename: &HgPath, entry: DirstateEntry, ) -> Result<(), DirstateError> { let old_state = self.get(filename)?.map(|e| e.state()); - Ok(self.add_or_remove_file(filename, old_state, entry)?) + let map = self.get_map_mut(); + Ok(map.add_or_remove_file(filename, old_state, entry)?) } - fn remove_file( + pub fn remove_file( &mut self, filename: &HgPath, in_merge: bool, @@ -781,17 +785,19 @@ if size == 0 { self.copy_map_remove(filename)?; } + let map = self.get_map_mut(); let entry = DirstateEntry::new_removed(size); - Ok(self.add_or_remove_file(filename, old_state, entry)?) + Ok(map.add_or_remove_file(filename, old_state, entry)?) } - fn drop_entry_and_copy_source( + pub fn drop_entry_and_copy_source( &mut self, filename: &HgPath, ) -> Result<(), DirstateError> { let was_tracked = self .get(filename)? .map_or(false, |e| e.state().is_tracked()); + let map = self.get_map_mut(); struct Dropped { was_tracked: bool, had_entry: bool, @@ -879,16 +885,16 @@ } if let Some((dropped, _removed)) = recur( - self.on_disk, - &mut self.unreachable_bytes, - &mut self.root, + map.on_disk, + &mut map.unreachable_bytes, + &mut map.root, filename, )? { if dropped.had_entry { - self.nodes_with_entry_count -= 1 + map.nodes_with_entry_count -= 1 } if dropped.had_copy_source { - self.nodes_with_copy_source_count -= 1 + map.nodes_with_copy_source_count -= 1 } } else { debug_assert!(!was_tracked); @@ -896,11 +902,12 @@ Ok(()) } - fn has_tracked_dir( + pub fn has_tracked_dir( &mut self, directory: &HgPath, ) -> Result<bool, DirstateError> { - if let Some(node) = self.get_node(directory)? { + let map = self.get_map_mut(); + if let Some(node) = map.get_node(directory)? { // A node without a `DirstateEntry` was created to hold child // nodes, and is therefore a directory. let state = node.state()?; @@ -910,8 +917,12 @@ } } - fn has_dir(&mut self, directory: &HgPath) -> Result<bool, DirstateError> { - if let Some(node) = self.get_node(directory)? { + pub fn has_dir( + &mut self, + directory: &HgPath, + ) -> Result<bool, DirstateError> { + let map = self.get_map_mut(); + if let Some(node) = map.get_node(directory)? { // A node without a `DirstateEntry` was created to hold child // nodes, and is therefore a directory. let state = node.state()?; @@ -922,43 +933,44 @@ } #[timed] - fn pack_v1( + pub fn pack_v1( &mut self, parents: DirstateParents, now: Timestamp, ) -> Result<Vec<u8>, DirstateError> { + let map = self.get_map_mut(); let now: i32 = now.0.try_into().expect("time overflow"); let mut ambiguous_mtimes = Vec::new(); // Optizimation (to be measured?): pre-compute size to avoid `Vec` // reallocations let mut size = parents.as_bytes().len(); - for node in self.iter_nodes() { + for node in map.iter_nodes() { let node = node?; if let Some(entry) = node.entry()? { size += packed_entry_size( - node.full_path(self.on_disk)?, - node.copy_source(self.on_disk)?, + node.full_path(map.on_disk)?, + node.copy_source(map.on_disk)?, ); if entry.mtime_is_ambiguous(now) { ambiguous_mtimes.push( - node.full_path_borrowed(self.on_disk)? + node.full_path_borrowed(map.on_disk)? .detach_from_tree(), ) } } } - self.clear_known_ambiguous_mtimes(&ambiguous_mtimes)?; + map.clear_known_ambiguous_mtimes(&ambiguous_mtimes)?; let mut packed = Vec::with_capacity(size); packed.extend(parents.as_bytes()); - for node in self.iter_nodes() { + for node in map.iter_nodes() { let node = node?; if let Some(entry) = node.entry()? { pack_entry( - node.full_path(self.on_disk)?, + node.full_path(map.on_disk)?, &entry, - node.copy_source(self.on_disk)?, + node.copy_source(map.on_disk)?, &mut packed, ); } @@ -968,23 +980,24 @@ /// Returns new data and metadata together with whether that data should be /// appended to the existing data file whose content is at - /// `self.on_disk` (true), instead of written to a new data file + /// `map.on_disk` (true), instead of written to a new data file /// (false). #[timed] - fn pack_v2( + pub fn pack_v2( &mut self, now: Timestamp, can_append: bool, ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { + let map = self.get_map_mut(); // TODO: how do we want to handle this in 2038? let now: i32 = now.0.try_into().expect("time overflow"); let mut paths = Vec::new(); - for node in self.iter_nodes() { + for node in map.iter_nodes() { let node = node?; if let Some(entry) = node.entry()? { if entry.mtime_is_ambiguous(now) { paths.push( - node.full_path_borrowed(self.on_disk)? + node.full_path_borrowed(map.on_disk)? .detach_from_tree(), ) } @@ -992,12 +1005,12 @@ } // Borrow of `self` ends here since we collect cloned paths - self.clear_known_ambiguous_mtimes(&paths)?; + map.clear_known_ambiguous_mtimes(&paths)?; - on_disk::write(self, can_append) + on_disk::write(map, can_append) } - fn status<'a>( + pub fn status<'a>( &'a mut self, matcher: &'a (dyn Matcher + Sync), root_dir: PathBuf, @@ -1005,119 +1018,129 @@ options: StatusOptions, ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError> { - super::status::status(self, matcher, root_dir, ignore_files, options) + let map = self.get_map_mut(); + super::status::status(map, matcher, root_dir, ignore_files, options) } - fn copy_map_len(&self) -> usize { - self.nodes_with_copy_source_count as usize + pub fn copy_map_len(&self) -> usize { + let map = self.get_map(); + map.nodes_with_copy_source_count as usize } - fn copy_map_iter(&self) -> CopyMapIter<'_> { - Box::new(filter_map_results(self.iter_nodes(), move |node| { - Ok(if let Some(source) = node.copy_source(self.on_disk)? { - Some((node.full_path(self.on_disk)?, source)) + pub fn copy_map_iter(&self) -> CopyMapIter<'_> { + let map = self.get_map(); + Box::new(filter_map_results(map.iter_nodes(), move |node| { + Ok(if let Some(source) = node.copy_source(map.on_disk)? { + Some((node.full_path(map.on_disk)?, source)) } else { None }) })) } - fn copy_map_contains_key( + pub fn copy_map_contains_key( &self, key: &HgPath, ) -> Result<bool, DirstateV2ParseError> { - Ok(if let Some(node) = self.get_node(key)? { + let map = self.get_map(); + Ok(if let Some(node) = map.get_node(key)? { node.has_copy_source() } else { false }) } - fn copy_map_get( + pub fn copy_map_get( &self, key: &HgPath, ) -> Result<Option<&HgPath>, DirstateV2ParseError> { - if let Some(node) = self.get_node(key)? { - if let Some(source) = node.copy_source(self.on_disk)? { + let map = self.get_map(); + if let Some(node) = map.get_node(key)? { + if let Some(source) = node.copy_source(map.on_disk)? { return Ok(Some(source)); } } Ok(None) } - fn copy_map_remove( + pub fn copy_map_remove( &mut self, key: &HgPath, ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { - let count = &mut self.nodes_with_copy_source_count; - let unreachable_bytes = &mut self.unreachable_bytes; - Ok(Self::get_node_mut( - self.on_disk, + let map = self.get_map_mut(); + let count = &mut map.nodes_with_copy_source_count; + let unreachable_bytes = &mut map.unreachable_bytes; + Ok(DirstateMap::get_node_mut( + map.on_disk, unreachable_bytes, - &mut self.root, + &mut map.root, key, )? .and_then(|node| { if let Some(source) = &node.copy_source { *count -= 1; - Self::count_dropped_path(unreachable_bytes, source); + DirstateMap::count_dropped_path(unreachable_bytes, source); } node.copy_source.take().map(Cow::into_owned) })) } - fn copy_map_insert( + pub fn copy_map_insert( &mut self, key: HgPathBuf, value: HgPathBuf, ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { - let node = Self::get_or_insert_node( - self.on_disk, - &mut self.unreachable_bytes, - &mut self.root, + let map = self.get_map_mut(); + let node = DirstateMap::get_or_insert_node( + map.on_disk, + &mut map.unreachable_bytes, + &mut map.root, &key, WithBasename::to_cow_owned, |_ancestor| {}, )?; if node.copy_source.is_none() { - self.nodes_with_copy_source_count += 1 + map.nodes_with_copy_source_count += 1 } Ok(node.copy_source.replace(value.into()).map(Cow::into_owned)) } - fn len(&self) -> usize { - self.nodes_with_entry_count as usize + pub fn len(&self) -> usize { + let map = self.get_map(); + map.nodes_with_entry_count as usize } - fn contains_key( + pub fn contains_key( &self, key: &HgPath, ) -> Result<bool, DirstateV2ParseError> { Ok(self.get(key)?.is_some()) } - fn get( + pub fn get( &self, key: &HgPath, ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> { - Ok(if let Some(node) = self.get_node(key)? { + let map = self.get_map(); + Ok(if let Some(node) = map.get_node(key)? { node.entry()? } else { None }) } - fn iter(&self) -> StateMapIter<'_> { - Box::new(filter_map_results(self.iter_nodes(), move |node| { + pub fn iter(&self) -> StateMapIter<'_> { + let map = self.get_map(); + Box::new(filter_map_results(map.iter_nodes(), move |node| { Ok(if let Some(entry) = node.entry()? { - Some((node.full_path(self.on_disk)?, entry)) + Some((node.full_path(map.on_disk)?, entry)) } else { None }) })) } - fn iter_tracked_dirs( + pub fn iter_tracked_dirs( &mut self, ) -> Result< Box< @@ -1127,9 +1150,10 @@ >, DirstateError, > { - let on_disk = self.on_disk; + let map = self.get_map_mut(); + let on_disk = map.on_disk; Ok(Box::new(filter_map_results( - self.iter_nodes(), + map.iter_nodes(), move |node| { Ok(if node.tracked_descendants_count() > 0 { Some(node.full_path(on_disk)?) @@ -1140,7 +1164,7 @@ ))) } - fn debug_iter( + pub fn debug_iter( &self, all: bool, ) -> Box< @@ -1152,7 +1176,8 @@ > + Send + '_, > { - Box::new(filter_map_results(self.iter_nodes(), move |node| { + let map = self.get_map(); + Box::new(filter_map_results(map.iter_nodes(), move |node| { let debug_tuple = if let Some(entry) = node.entry()? { entry.debug_tuple() } else if !all { @@ -1162,7 +1187,7 @@ } else { (b' ', 0, -1, -1) }; - Ok(Some((node.full_path(self.on_disk)?, debug_tuple))) + Ok(Some((node.full_path(map.on_disk)?, debug_tuple))) })) } }
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs Mon Sep 27 12:09:15 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -use std::path::PathBuf; - -use crate::dirstate::parsers::Timestamp; -use crate::dirstate::CopyMapIter; -use crate::dirstate::StateMapIter; -use crate::dirstate_tree::on_disk::DirstateV2ParseError; -use crate::matchers::Matcher; -use crate::utils::hg_path::{HgPath, HgPathBuf}; -use crate::DirstateEntry; -use crate::DirstateError; -use crate::DirstateParents; -use crate::DirstateStatus; -use crate::PatternFileWarning; -use crate::StatusError; -use crate::StatusOptions; - -/// `rust/hg-cpython/src/dirstate/dirstate_map.rs` implements in Rust a -/// `DirstateMap` Python class that wraps `Box<dyn DirstateMapMethods + Send>`, -/// a trait object of this trait. Except for constructors, this trait defines -/// all APIs that the class needs to interact with its inner dirstate map. -/// -/// A trait object is used to support two different concrete types: -/// -/// * `rust/hg-core/src/dirstate/dirstate_map.rs` defines the "flat dirstate -/// map" which is based on a few large `HgPath`-keyed `HashMap` and `HashSet` -/// fields. -/// * `rust/hg-core/src/dirstate_tree/dirstate_map.rs` defines the "tree -/// dirstate map" based on a tree data struture with nodes for directories -/// containing child nodes for their files and sub-directories. This tree -/// enables a more efficient algorithm for `hg status`, but its details are -/// abstracted in this trait. -/// -/// The dirstate map associates paths of files in the working directory to -/// various information about the state of those files. -pub trait DirstateMapMethods { - /// Remove information about all files in this map - fn clear(&mut self); - - /// Add the given filename to the map if it is not already there, and - /// associate the given entry with it. - fn set_entry( - &mut self, - filename: &HgPath, - entry: DirstateEntry, - ) -> Result<(), DirstateV2ParseError>; - - /// Add or change the information associated to a given file. - fn add_file( - &mut self, - filename: &HgPath, - entry: DirstateEntry, - ) -> Result<(), DirstateError>; - - /// Mark a file as "removed" (as in `hg rm`). - fn remove_file( - &mut self, - filename: &HgPath, - in_merge: bool, - ) -> Result<(), DirstateError>; - - /// Drop information about this file from the map if any. - /// - /// `get` will now return `None` for this filename. - fn drop_entry_and_copy_source( - &mut self, - filename: &HgPath, - ) -> Result<(), DirstateError>; - - /// Returns whether the sub-tree rooted at the given directory contains any - /// tracked file. - /// - /// A file is tracked if it has a `state` other than `EntryState::Removed`. - fn has_tracked_dir( - &mut self, - directory: &HgPath, - ) -> Result<bool, DirstateError>; - - /// Returns whether the sub-tree rooted at the given directory contains any - /// file with a dirstate entry. - fn has_dir(&mut self, directory: &HgPath) -> Result<bool, DirstateError>; - - /// Clear mtimes equal to `now` in entries with `state == - /// EntryState::Normal`, and serialize bytes to write the `.hg/dirstate` - /// file to disk in dirstate-v1 format. - fn pack_v1( - &mut self, - parents: DirstateParents, - now: Timestamp, - ) -> Result<Vec<u8>, DirstateError>; - - /// Clear mtimes equal to `now` in entries with `state == - /// EntryState::Normal`, and serialize bytes to write a dirstate data file - /// to disk in dirstate-v2 format. - /// - /// Returns new data and metadata together with whether that data should be - /// appended to the existing data file whose content is at - /// `self.on_disk` (true), instead of written to a new data file - /// (false). - /// - /// Note: this is only supported by the tree dirstate map. - fn pack_v2( - &mut self, - now: Timestamp, - can_append: bool, - ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError>; - - /// Run the status algorithm. - /// - /// This is not sematically a method of the dirstate map, but a different - /// algorithm is used for the flat v.s. tree dirstate map so having it in - /// this trait enables the same dynamic dispatch as with other methods. - fn status<'a>( - &'a mut self, - matcher: &'a (dyn Matcher + Sync), - root_dir: PathBuf, - ignore_files: Vec<PathBuf>, - options: StatusOptions, - ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>; - - /// Returns how many files in the dirstate map have a recorded copy source. - fn copy_map_len(&self) -> usize; - - /// Returns an iterator of `(path, copy_source)` for all files that have a - /// copy source. - fn copy_map_iter(&self) -> CopyMapIter<'_>; - - /// Returns whether the givef file has a copy source. - fn copy_map_contains_key( - &self, - key: &HgPath, - ) -> Result<bool, DirstateV2ParseError>; - - /// Returns the copy source for the given file. - fn copy_map_get( - &self, - key: &HgPath, - ) -> Result<Option<&HgPath>, DirstateV2ParseError>; - - /// Removes the recorded copy source if any for the given file, and returns - /// it. - fn copy_map_remove( - &mut self, - key: &HgPath, - ) -> Result<Option<HgPathBuf>, DirstateV2ParseError>; - - /// Set the given `value` copy source for the given `key` file. - fn copy_map_insert( - &mut self, - key: HgPathBuf, - value: HgPathBuf, - ) -> Result<Option<HgPathBuf>, DirstateV2ParseError>; - - /// Returns the number of files that have an entry. - fn len(&self) -> usize; - - /// Returns whether the given file has an entry. - fn contains_key(&self, key: &HgPath) - -> Result<bool, DirstateV2ParseError>; - - /// Returns the entry, if any, for the given file. - fn get( - &self, - key: &HgPath, - ) -> Result<Option<DirstateEntry>, DirstateV2ParseError>; - - /// Returns a `(path, entry)` iterator of files that have an entry. - /// - /// Because parse errors can happen during iteration, the iterated items - /// are `Result`s. - fn iter(&self) -> StateMapIter<'_>; - - /// Returns an iterator of tracked directories. - /// - /// This is the paths for which `has_tracked_dir` would return true. - /// Or, in other words, the union of ancestor paths of all paths that have - /// an associated entry in a "tracked" state in this dirstate map. - /// - /// Because parse errors can happen during iteration, the iterated items - /// are `Result`s. - fn iter_tracked_dirs( - &mut self, - ) -> Result< - Box< - dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> - + Send - + '_, - >, - DirstateError, - >; - - /// Return an iterator of `(path, (state, mode, size, mtime))` for every - /// node stored in this dirstate map, for the purpose of the `hg - /// debugdirstate` command. - /// - /// If `all` is true, include nodes that don’t have an entry. - /// For such nodes `state` is the ASCII space. - /// An `mtime` may still be present. It is used to optimize `status`. - /// - /// Because parse errors can happen during iteration, the iterated items - /// are `Result`s. - fn debug_iter( - &self, - all: bool, - ) -> Box< - dyn Iterator< - Item = Result< - (&HgPath, (u8, i32, i32, i32)), - DirstateV2ParseError, - >, - > + Send - + '_, - >; -}
--- a/rust/hg-core/src/dirstate_tree/owning.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/hg-core/src/dirstate_tree/owning.rs Mon Sep 27 13:52:49 2021 +0200 @@ -44,7 +44,7 @@ Self { on_disk, ptr } } - pub fn get_mut_pair<'a>( + pub fn get_pair_mut<'a>( &'a mut self, ) -> (&'a [u8], &'a mut DirstateMap<'a>) { // SAFETY: We cast the type-erased pointer back to the same type it had @@ -60,11 +60,11 @@ (&self.on_disk, unsafe { &mut *ptr }) } - pub fn get_mut<'a>(&'a mut self) -> &'a mut DirstateMap<'a> { - self.get_mut_pair().1 + pub fn get_map_mut<'a>(&'a mut self) -> &'a mut DirstateMap<'a> { + self.get_pair_mut().1 } - pub fn get<'a>(&'a self) -> &'a DirstateMap<'a> { + pub fn get_map<'a>(&'a self) -> &'a DirstateMap<'a> { // SAFETY: same reasoning as in `get_mut` above. let ptr: *mut DirstateMap<'a> = self.ptr.cast(); unsafe { &*ptr }
--- a/rust/hg-core/src/dirstate_tree/owning_dispatch.rs Mon Sep 27 12:09:15 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,179 +0,0 @@ -use crate::dirstate::parsers::Timestamp; -use crate::dirstate::CopyMapIter; -use crate::dirstate::StateMapIter; -use crate::dirstate_tree::dispatch::DirstateMapMethods; -use crate::dirstate_tree::on_disk::DirstateV2ParseError; -use crate::dirstate_tree::owning::OwningDirstateMap; -use crate::matchers::Matcher; -use crate::utils::hg_path::{HgPath, HgPathBuf}; -use crate::DirstateEntry; -use crate::DirstateError; -use crate::DirstateParents; -use crate::DirstateStatus; -use crate::PatternFileWarning; -use crate::StatusError; -use crate::StatusOptions; -use std::path::PathBuf; - -impl DirstateMapMethods for OwningDirstateMap { - fn clear(&mut self) { - self.get_mut().clear() - } - - fn set_entry( - &mut self, - filename: &HgPath, - entry: DirstateEntry, - ) -> Result<(), DirstateV2ParseError> { - self.get_mut().set_entry(filename, entry) - } - - fn add_file( - &mut self, - filename: &HgPath, - entry: DirstateEntry, - ) -> Result<(), DirstateError> { - self.get_mut().add_file(filename, entry) - } - - fn remove_file( - &mut self, - filename: &HgPath, - in_merge: bool, - ) -> Result<(), DirstateError> { - self.get_mut().remove_file(filename, in_merge) - } - - fn drop_entry_and_copy_source( - &mut self, - filename: &HgPath, - ) -> Result<(), DirstateError> { - self.get_mut().drop_entry_and_copy_source(filename) - } - - fn has_tracked_dir( - &mut self, - directory: &HgPath, - ) -> Result<bool, DirstateError> { - self.get_mut().has_tracked_dir(directory) - } - - fn has_dir(&mut self, directory: &HgPath) -> Result<bool, DirstateError> { - self.get_mut().has_dir(directory) - } - - fn pack_v1( - &mut self, - parents: DirstateParents, - now: Timestamp, - ) -> Result<Vec<u8>, DirstateError> { - self.get_mut().pack_v1(parents, now) - } - - fn pack_v2( - &mut self, - now: Timestamp, - can_append: bool, - ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { - self.get_mut().pack_v2(now, can_append) - } - - fn status<'a>( - &'a mut self, - matcher: &'a (dyn Matcher + Sync), - root_dir: PathBuf, - ignore_files: Vec<PathBuf>, - options: StatusOptions, - ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError> - { - self.get_mut() - .status(matcher, root_dir, ignore_files, options) - } - - fn copy_map_len(&self) -> usize { - self.get().copy_map_len() - } - - fn copy_map_iter(&self) -> CopyMapIter<'_> { - self.get().copy_map_iter() - } - - fn copy_map_contains_key( - &self, - key: &HgPath, - ) -> Result<bool, DirstateV2ParseError> { - self.get().copy_map_contains_key(key) - } - - fn copy_map_get( - &self, - key: &HgPath, - ) -> Result<Option<&HgPath>, DirstateV2ParseError> { - self.get().copy_map_get(key) - } - - fn copy_map_remove( - &mut self, - key: &HgPath, - ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { - self.get_mut().copy_map_remove(key) - } - - fn copy_map_insert( - &mut self, - key: HgPathBuf, - value: HgPathBuf, - ) -> Result<Option<HgPathBuf>, DirstateV2ParseError> { - self.get_mut().copy_map_insert(key, value) - } - - fn len(&self) -> usize { - self.get().len() - } - - fn contains_key( - &self, - key: &HgPath, - ) -> Result<bool, DirstateV2ParseError> { - self.get().contains_key(key) - } - - fn get( - &self, - key: &HgPath, - ) -> Result<Option<DirstateEntry>, DirstateV2ParseError> { - self.get().get(key) - } - - fn iter(&self) -> StateMapIter<'_> { - self.get().iter() - } - - fn iter_tracked_dirs( - &mut self, - ) -> Result< - Box< - dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> - + Send - + '_, - >, - DirstateError, - > { - self.get_mut().iter_tracked_dirs() - } - - fn debug_iter( - &self, - all: bool, - ) -> Box< - dyn Iterator< - Item = Result< - (&HgPath, (u8, i32, i32, i32)), - DirstateV2ParseError, - >, - > + Send - + '_, - > { - self.get().debug_iter(all) - } -}
--- a/rust/hg-core/src/repo.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/hg-core/src/repo.rs Mon Sep 27 13:52:49 2021 +0200 @@ -294,12 +294,12 @@ } else { OwningDirstateMap::new_empty(Vec::new()) }; - let (on_disk, placeholder) = map.get_mut_pair(); + let (on_disk, placeholder) = map.get_pair_mut(); *placeholder = DirstateMap::new_v2(on_disk, data_size, metadata)?; Ok(map) } else { let mut map = OwningDirstateMap::new_empty(dirstate_file_contents); - let (on_disk, placeholder) = map.get_mut_pair(); + let (on_disk, placeholder) = map.get_pair_mut(); let (inner, parents) = DirstateMap::new_v1(on_disk)?; self.dirstate_parents .set(Some(parents.unwrap_or(DirstateParents::NULL)));
--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs Mon Sep 27 13:52:49 2021 +0200 @@ -25,7 +25,6 @@ dirstate::parsers::Timestamp, dirstate::StateMapIter, dirstate_tree::dirstate_map::DirstateMap as TreeDirstateMap, - dirstate_tree::dispatch::DirstateMapMethods, dirstate_tree::on_disk::DirstateV2ParseError, dirstate_tree::owning::OwningDirstateMap, revlog::Node, @@ -47,7 +46,7 @@ // All attributes also have to have a separate refcount data attribute for // leaks, with all methods that go along for reference sharing. py_class!(pub class DirstateMap |py| { - @shared data inner: Box<dyn DirstateMapMethods + Send>; + @shared data inner: OwningDirstateMap; /// Returns a `(dirstate_map, parents)` tuple @staticmethod @@ -56,12 +55,12 @@ ) -> PyResult<PyObject> { let on_disk = PyBytesDeref::new(py, on_disk); let mut map = OwningDirstateMap::new_empty(on_disk); - let (on_disk, map_placeholder) = map.get_mut_pair(); + let (on_disk, map_placeholder) = map.get_pair_mut(); let (actual_map, parents) = TreeDirstateMap::new_v1(on_disk) .map_err(|e| dirstate_error(py, e))?; *map_placeholder = actual_map; - let map = Self::create_instance(py, Box::new(map))?; + let map = Self::create_instance(py, map)?; let parents = parents.map(|p| { let p1 = PyBytes::new(py, p.p1.as_bytes()); let p2 = PyBytes::new(py, p.p2.as_bytes()); @@ -82,11 +81,11 @@ }; let on_disk = PyBytesDeref::new(py, on_disk); let mut map = OwningDirstateMap::new_empty(on_disk); - let (on_disk, map_placeholder) = map.get_mut_pair(); + let (on_disk, map_placeholder) = map.get_pair_mut(); *map_placeholder = TreeDirstateMap::new_v2( on_disk, data_size, tree_metadata.data(py), ).map_err(dirstate_error)?; - let map = Self::create_instance(py, Box::new(map))?; + let map = Self::create_instance(py, map)?; Ok(map.into_object()) } @@ -452,7 +451,7 @@ pub fn get_inner_mut<'a>( &'a self, py: Python<'a>, - ) -> RefMut<'a, Box<dyn DirstateMapMethods + Send>> { + ) -> RefMut<'a, OwningDirstateMap> { self.inner(py).borrow_mut() } fn translate_key(
--- a/rust/rhg/src/commands/status.rs Mon Sep 27 12:09:15 2021 +0200 +++ b/rust/rhg/src/commands/status.rs Mon Sep 27 13:52:49 2021 +0200 @@ -9,7 +9,6 @@ use crate::ui::Ui; use clap::{Arg, SubCommand}; use hg; -use hg::dirstate_tree::dispatch::DirstateMapMethods; use hg::errors::HgError; use hg::manifest::Manifest; use hg::matchers::AlwaysMatcher;