| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
No it’s fairly recent that we don’t reset some mtimes based on need_delay during serialization anymore
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate_tree/dirstate_map.rs (8 lines) | |||
| M | rust/hg-core/src/dirstate_tree/on_disk.rs (2 lines) | |||
| M | rust/hg-cpython/src/dirstate/dirstate_map.rs (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | D11836 rust: Add Vfs::write_atomic | |
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| Ok(state.is_none() && node.descendants_with_entry_count() > 0) | Ok(state.is_none() && node.descendants_with_entry_count() > 0) | ||||
| } else { | } else { | ||||
| Ok(false) | Ok(false) | ||||
| } | } | ||||
| } | } | ||||
| #[timed] | #[timed] | ||||
| pub fn pack_v1( | pub fn pack_v1( | ||||
| &mut self, | &self, | ||||
| parents: DirstateParents, | parents: DirstateParents, | ||||
| ) -> Result<Vec<u8>, DirstateError> { | ) -> Result<Vec<u8>, DirstateError> { | ||||
| let map = self.get_map_mut(); | let map = self.get_map(); | ||||
| // Optizimation (to be measured?): pre-compute size to avoid `Vec` | // Optizimation (to be measured?): pre-compute size to avoid `Vec` | ||||
| // reallocations | // reallocations | ||||
| let mut size = parents.as_bytes().len(); | let mut size = parents.as_bytes().len(); | ||||
| for node in map.iter_nodes() { | for node in map.iter_nodes() { | ||||
| let node = node?; | let node = node?; | ||||
| if node.entry()?.is_some() { | if node.entry()?.is_some() { | ||||
| size += packed_entry_size( | size += packed_entry_size( | ||||
| node.full_path(map.on_disk)?, | node.full_path(map.on_disk)?, | ||||
| } | } | ||||
| /// Returns new data and metadata together with whether that data should be | /// Returns new data and metadata together with whether that data should be | ||||
| /// appended to the existing data file whose content is at | /// appended to the existing data file whose content is at | ||||
| /// `map.on_disk` (true), instead of written to a new data file | /// `map.on_disk` (true), instead of written to a new data file | ||||
| /// (false). | /// (false). | ||||
| #[timed] | #[timed] | ||||
| pub fn pack_v2( | pub fn pack_v2( | ||||
| &mut self, | &self, | ||||
| can_append: bool, | can_append: bool, | ||||
| ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { | ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { | ||||
| let map = self.get_map_mut(); | let map = self.get_map(); | ||||
| on_disk::write(map, can_append) | on_disk::write(map, can_append) | ||||
| } | } | ||||
| pub fn status<'a>( | pub fn status<'a>( | ||||
| &'a mut self, | &'a mut self, | ||||
| matcher: &'a (dyn Matcher + Sync), | matcher: &'a (dyn Matcher + Sync), | ||||
| root_dir: PathBuf, | root_dir: PathBuf, | ||||
| ignore_files: Vec<PathBuf>, | ignore_files: Vec<PathBuf>, | ||||
| recur(on_disk, meta.root_nodes, &mut f) | recur(on_disk, meta.root_nodes, &mut f) | ||||
| } | } | ||||
| /// Returns new data and metadata, together with whether that data should be | /// Returns new data and metadata, together with whether that data should be | ||||
| /// appended to the existing data file whose content is at | /// appended to the existing data file whose content is at | ||||
| /// `dirstate_map.on_disk` (true), instead of written to a new data file | /// `dirstate_map.on_disk` (true), instead of written to a new data file | ||||
| /// (false). | /// (false). | ||||
| pub(super) fn write( | pub(super) fn write( | ||||
| dirstate_map: &mut DirstateMap, | dirstate_map: &DirstateMap, | ||||
| can_append: bool, | can_append: bool, | ||||
| ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { | ) -> Result<(Vec<u8>, Vec<u8>, bool), DirstateError> { | ||||
| let append = can_append && dirstate_map.write_should_append(); | let append = can_append && dirstate_map.write_should_append(); | ||||
| // This ignores the space for paths, and for nodes without an entry. | // This ignores the space for paths, and for nodes without an entry. | ||||
| // TODO: better estimate? Skip the `Vec` and write to a file directly? | // TODO: better estimate? Skip the `Vec` and write to a file directly? | ||||
| let size_guess = std::mem::size_of::<Node>() | let size_guess = std::mem::size_of::<Node>() | ||||
| * dirstate_map.nodes_with_entry_count as usize; | * dirstate_map.nodes_with_entry_count as usize; | ||||
| .to_py_object(py)) | .to_py_object(py)) | ||||
| } | } | ||||
| def write_v1( | def write_v1( | ||||
| &self, | &self, | ||||
| p1: PyObject, | p1: PyObject, | ||||
| p2: PyObject, | p2: PyObject, | ||||
| ) -> PyResult<PyBytes> { | ) -> PyResult<PyBytes> { | ||||
| let mut inner = self.inner(py).borrow_mut(); | let inner = self.inner(py).borrow(); | ||||
| let parents = DirstateParents { | let parents = DirstateParents { | ||||
| p1: extract_node_id(py, &p1)?, | p1: extract_node_id(py, &p1)?, | ||||
| p2: extract_node_id(py, &p2)?, | p2: extract_node_id(py, &p2)?, | ||||
| }; | }; | ||||
| let result = inner.pack_v1(parents); | let result = inner.pack_v1(parents); | ||||
| match result { | match result { | ||||
| Ok(packed) => Ok(PyBytes::new(py, &packed)), | Ok(packed) => Ok(PyBytes::new(py, &packed)), | ||||
| Err(_) => Err(PyErr::new::<exc::OSError, _>( | Err(_) => Err(PyErr::new::<exc::OSError, _>( | ||||
| py, | py, | ||||
| "Dirstate error".to_string(), | "Dirstate error".to_string(), | ||||
| )), | )), | ||||
| } | } | ||||
| } | } | ||||
| /// Returns new data together with whether that data should be appended to | /// Returns new data together with whether that data should be appended to | ||||
| /// the existing data file whose content is at `self.on_disk` (True), | /// the existing data file whose content is at `self.on_disk` (True), | ||||
| /// instead of written to a new data file (False). | /// instead of written to a new data file (False). | ||||
| def write_v2( | def write_v2( | ||||
| &self, | &self, | ||||
| can_append: bool, | can_append: bool, | ||||
| ) -> PyResult<PyObject> { | ) -> PyResult<PyObject> { | ||||
| let mut inner = self.inner(py).borrow_mut(); | let inner = self.inner(py).borrow(); | ||||
| let result = inner.pack_v2(can_append); | let result = inner.pack_v2(can_append); | ||||
| match result { | match result { | ||||
| Ok((packed, tree_metadata, append)) => { | Ok((packed, tree_metadata, append)) => { | ||||
| let packed = PyBytes::new(py, &packed); | let packed = PyBytes::new(py, &packed); | ||||
| let tree_metadata = PyBytes::new(py, &tree_metadata); | let tree_metadata = PyBytes::new(py, &tree_metadata); | ||||
| let tuple = (packed, tree_metadata, append); | let tuple = (packed, tree_metadata, append); | ||||
| Ok(tuple.to_py_object(py).into_object()) | Ok(tuple.to_py_object(py).into_object()) | ||||
| }, | }, | ||||