This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12519

rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods
Needs ReviewPublic

Authored by Alphare on Tue, Apr 12, 12:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

These methods were needed crutches before the Rust implementation caught up
to Python. Calling set_entry (whether from Python or Rust) was dangerous
since it didn't update any of the counters of the DirstateMap data structure,
while having no real way of knowing when to use it "correctly" except it you
were one of the 3 people who looked deep enough into the soul of this code.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 33082

rust/hg-core/src/dirstate_tree/dirstate_map.rs

pub fn clear(&mut self) { pub fn clear(&mut self) {
self.with_dmap_mut(|map| { self.with_dmap_mut(|map| {
map.root = Default::default(); map.root = Default::default();
map.nodes_with_entry_count = 0; map.nodes_with_entry_count = 0;
map.nodes_with_copy_source_count = 0; map.nodes_with_copy_source_count = 0;
}); });
} }
pub fn set_entry(
&mut self,
filename: &HgPath,
entry: DirstateEntry,
) -> Result<(), DirstateV2ParseError> {
self.with_dmap_mut(|map| {
map.get_or_insert(&filename)?.data = NodeData::Entry(entry);
Ok(())
})
}
pub fn set_tracked( pub fn set_tracked(
&mut self, &mut self,
filename: &HgPath, filename: &HgPath,
) -> Result<bool, DirstateV2ParseError> { ) -> Result<bool, DirstateV2ParseError> {
let old_entry_opt = self.get(filename)?; let old_entry_opt = self.get(filename)?;
self.with_dmap_mut(|map| map.set_tracked(filename, old_entry_opt)) self.with_dmap_mut(|map| map.set_tracked(filename, old_entry_opt))
} }

rust/hg-cpython/src/dirstate/dirstate_map.rs

{ {
Some(entry) => { Some(entry) => {
Ok(Some(DirstateItem::new_as_pyobject(py, entry)?)) Ok(Some(DirstateItem::new_as_pyobject(py, entry)?))
}, },
None => Ok(default) None => Ok(default)
} }
} }
def set_dirstate_item(
&self,
path: PyObject,
item: DirstateItem
) -> PyResult<PyObject> {
let f = path.extract::<PyBytes>(py)?;
let filename = HgPath::new(f.data(py));
self.inner(py)
.borrow_mut()
.set_entry(filename, item.get_entry(py))
.map_err(|e| v2_error(py, e))?;
Ok(py.None())
}
def set_tracked(&self, f: PyObject) -> PyResult<PyBool> { def set_tracked(&self, f: PyObject) -> PyResult<PyBool> {
let bytes = f.extract::<PyBytes>(py)?; let bytes = f.extract::<PyBytes>(py)?;
let path = HgPath::new(bytes.data(py)); let path = HgPath::new(bytes.data(py));
let res = self.inner(py).borrow_mut().set_tracked(path); let res = self.inner(py).borrow_mut().set_tracked(path);
let was_tracked = res.or_else(|_| { let was_tracked = res.or_else(|_| {
Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string())) Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
})?; })?;
Ok(was_tracked.to_py_object(py)) Ok(was_tracked.to_py_object(py))