This fixes a bug when using fsmonitor that tries to iterate on the non normal
set, by adding a shared iterator interface.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
You need to add (issue6276) in your changeset summary so that the ticket get closed when you land this.
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate/dirstate_map.rs (19 lines) | |||
| M | rust/hg-cpython/src/dirstate/dirstate_map.rs (20 lines) | |||
| M | rust/hg-cpython/src/dirstate/non_normal_entries.rs (28 lines) |
| ) -> (&mut HashSet<HgPathBuf>, &mut HashSet<HgPathBuf>) { | ) -> (&mut HashSet<HgPathBuf>, &mut HashSet<HgPathBuf>) { | ||||
| self.set_non_normal_other_parent_entries(false); | self.set_non_normal_other_parent_entries(false); | ||||
| ( | ( | ||||
| self.non_normal_set.as_mut().unwrap(), | self.non_normal_set.as_mut().unwrap(), | ||||
| self.other_parent_set.as_mut().unwrap(), | self.other_parent_set.as_mut().unwrap(), | ||||
| ) | ) | ||||
| } | } | ||||
| /// Useful to get immutable references to those sets in contexts where | |||||
| /// you only have an immutable reference to the `DirstateMap`, like when | |||||
| /// sharing references with Python. | |||||
| /// | |||||
| /// TODO, get rid of this along with the other "setter/getter" stuff when | |||||
| /// a nice typestate plan is defined. | |||||
| /// | |||||
| /// # Panics | |||||
| /// | |||||
| /// Will panic if either set is `None`. | |||||
| pub fn get_non_normal_other_parent_entries_panic( | |||||
| &self, | |||||
| ) -> (&HashSet<HgPathBuf>, &HashSet<HgPathBuf>) { | |||||
| ( | |||||
| self.non_normal_set.as_ref().unwrap(), | |||||
| self.other_parent_set.as_ref().unwrap(), | |||||
| ) | |||||
| } | |||||
| pub fn set_non_normal_other_parent_entries(&mut self, force: bool) { | pub fn set_non_normal_other_parent_entries(&mut self, force: bool) { | ||||
| if !force | if !force | ||||
| && self.non_normal_set.is_some() | && self.non_normal_set.is_some() | ||||
| && self.other_parent_set.is_some() | && self.other_parent_set.is_some() | ||||
| { | { | ||||
| return; | return; | ||||
| } | } | ||||
| let mut non_normal = HashSet::new(); | let mut non_normal = HashSet::new(); | ||||
| use cpython::{ | use cpython::{ | ||||
| exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, | exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, | ||||
| PyObject, PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject, | PyObject, PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject, | ||||
| UnsafePyLeaked, | UnsafePyLeaked, | ||||
| }; | }; | ||||
| use crate::{ | use crate::{ | ||||
| dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator}, | dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator}, | ||||
| dirstate::non_normal_entries::NonNormalEntries, | dirstate::non_normal_entries::{ | ||||
| NonNormalEntries, NonNormalEntriesIterator, | |||||
| }, | |||||
| dirstate::{dirs_multiset::Dirs, make_dirstate_tuple}, | dirstate::{dirs_multiset::Dirs, make_dirstate_tuple}, | ||||
| }; | }; | ||||
| use hg::{ | use hg::{ | ||||
| utils::hg_path::{HgPath, HgPathBuf}, | utils::hg_path::{HgPath, HgPathBuf}, | ||||
| DirsMultiset, DirstateEntry, DirstateMap as RustDirstateMap, | DirsMultiset, DirstateEntry, DirstateMap as RustDirstateMap, | ||||
| DirstateMapError, DirstateParents, DirstateParseError, EntryState, | DirstateMapError, DirstateParents, DirstateParseError, EntryState, | ||||
| StateMapIter, PARENT_SIZE, | StateMapIter, PARENT_SIZE, | ||||
| }; | }; | ||||
| let ret = PyList::new(py, &[]); | let ret = PyList::new(py, &[]); | ||||
| for filename in res.iter() { | for filename in res.iter() { | ||||
| let as_pystring = PyBytes::new(py, filename.as_bytes()); | let as_pystring = PyBytes::new(py, filename.as_bytes()); | ||||
| ret.append(py, as_pystring.into_object()); | ret.append(py, as_pystring.into_object()); | ||||
| } | } | ||||
| Ok(ret) | Ok(ret) | ||||
| } | } | ||||
| def non_normal_entries_iter(&self) -> PyResult<NonNormalEntriesIterator> { | |||||
| // Make sure the sets are defined before we no longer have a mutable | |||||
| // reference to the dmap. | |||||
| self.inner(py) | |||||
| .borrow_mut() | |||||
| .set_non_normal_other_parent_entries(false); | |||||
| let leaked_ref = self.inner(py).leak_immutable(); | |||||
| NonNormalEntriesIterator::from_inner(py, unsafe { | |||||
| leaked_ref.map(py, |o| { | |||||
| o.get_non_normal_other_parent_entries_panic().0.iter() | |||||
| }) | |||||
| }) | |||||
| } | |||||
| def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> { | def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> { | ||||
| let d = d.extract::<PyBytes>(py)?; | let d = d.extract::<PyBytes>(py)?; | ||||
| Ok(self.inner(py).borrow_mut() | Ok(self.inner(py).borrow_mut() | ||||
| .has_tracked_dir(HgPath::new(d.data(py))) | .has_tracked_dir(HgPath::new(d.data(py))) | ||||
| .map_err(|e| { | .map_err(|e| { | ||||
| PyErr::new::<exc::ValueError, _>(py, e.to_string()) | PyErr::new::<exc::ValueError, _>(py, e.to_string()) | ||||
| })? | })? | ||||
| .to_py_object(py)) | .to_py_object(py)) | ||||
| // non_normal_other_parent_entries.rs | // non_normal_other_parent_entries.rs | ||||
| // | // | ||||
| // Copyright 2020 Raphaël Gomès <rgomes@octobus.net> | // Copyright 2020 Raphaël Gomès <rgomes@octobus.net> | ||||
| // | // | ||||
| // This software may be used and distributed according to the terms of the | // This software may be used and distributed according to the terms of the | ||||
| // GNU General Public License version 2 or any later version. | // GNU General Public License version 2 or any later version. | ||||
| use cpython::{ | use cpython::{ | ||||
| exc::NotImplementedError, CompareOp, ObjectProtocol, PyErr, PyList, | exc::NotImplementedError, CompareOp, ObjectProtocol, PyBytes, PyClone, | ||||
| PyObject, PyResult, PyString, Python, PythonObject, ToPyObject, | PyErr, PyList, PyObject, PyResult, PyString, Python, PythonObject, | ||||
| ToPyObject, UnsafePyLeaked, | |||||
| }; | }; | ||||
| use crate::dirstate::DirstateMap; | use crate::dirstate::DirstateMap; | ||||
| use hg::utils::hg_path::HgPathBuf; | |||||
| use std::cell::RefCell; | |||||
| use std::collections::hash_set; | |||||
| py_class!(pub class NonNormalEntries |py| { | py_class!(pub class NonNormalEntries |py| { | ||||
| data dmap: DirstateMap; | data dmap: DirstateMap; | ||||
| def __contains__(&self, key: PyObject) -> PyResult<bool> { | def __contains__(&self, key: PyObject) -> PyResult<bool> { | ||||
| self.dmap(py).non_normal_entries_contains(py, key) | self.dmap(py).non_normal_entries_contains(py, key) | ||||
| } | } | ||||
| def remove(&self, key: PyObject) -> PyResult<PyObject> { | def remove(&self, key: PyObject) -> PyResult<PyObject> { | ||||
| self.dmap(py).non_normal_entries_remove(py, key) | self.dmap(py).non_normal_entries_remove(py, key) | ||||
| } | } | ||||
| def union(&self, other: PyObject) -> PyResult<PyList> { | def union(&self, other: PyObject) -> PyResult<PyList> { | ||||
| self.dmap(py).non_normal_entries_union(py, other) | self.dmap(py).non_normal_entries_union(py, other) | ||||
| } | } | ||||
| def __richcmp__(&self, other: PyObject, op: CompareOp) -> PyResult<bool> { | def __richcmp__(&self, other: PyObject, op: CompareOp) -> PyResult<bool> { | ||||
| match op { | match op { | ||||
| CompareOp::Eq => self.is_equal_to(py, other), | CompareOp::Eq => self.is_equal_to(py, other), | ||||
| CompareOp::Ne => Ok(!self.is_equal_to(py, other)?), | CompareOp::Ne => Ok(!self.is_equal_to(py, other)?), | ||||
| _ => Err(PyErr::new::<NotImplementedError, _>(py, "")) | _ => Err(PyErr::new::<NotImplementedError, _>(py, "")) | ||||
| } | } | ||||
| } | } | ||||
| def __repr__(&self) -> PyResult<PyString> { | def __repr__(&self) -> PyResult<PyString> { | ||||
| self.dmap(py).non_normal_entries_display(py) | self.dmap(py).non_normal_entries_display(py) | ||||
| } | } | ||||
| def __iter__(&self) -> PyResult<NonNormalEntriesIterator> { | |||||
| self.dmap(py).non_normal_entries_iter(py) | |||||
| } | |||||
| }); | }); | ||||
| impl NonNormalEntries { | impl NonNormalEntries { | ||||
| pub fn from_inner(py: Python, dm: DirstateMap) -> PyResult<Self> { | pub fn from_inner(py: Python, dm: DirstateMap) -> PyResult<Self> { | ||||
| Self::create_instance(py, dm) | Self::create_instance(py, dm) | ||||
| } | } | ||||
| fn is_equal_to(&self, py: Python, other: PyObject) -> PyResult<bool> { | fn is_equal_to(&self, py: Python, other: PyObject) -> PyResult<bool> { | ||||
| for item in other.iter(py)? { | for item in other.iter(py)? { | ||||
| if !self.dmap(py).non_normal_entries_contains(py, item?)? { | if !self.dmap(py).non_normal_entries_contains(py, item?)? { | ||||
| return Ok(false); | return Ok(false); | ||||
| } | } | ||||
| } | } | ||||
| Ok(true) | Ok(true) | ||||
| } | } | ||||
| fn translate_key( | |||||
| py: Python, | |||||
| key: &HgPathBuf, | |||||
| ) -> PyResult<Option<PyBytes>> { | |||||
| Ok(Some(PyBytes::new(py, key.as_ref()))) | |||||
| } | } | ||||
| } | |||||
| type NonNormalEntriesIter<'a> = hash_set::Iter<'a, HgPathBuf>; | |||||
| py_shared_iterator!( | |||||
| NonNormalEntriesIterator, | |||||
| UnsafePyLeaked<NonNormalEntriesIter<'static>>, | |||||
| NonNormalEntries::translate_key, | |||||
| Option<PyBytes> | |||||
| ); | |||||