This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12473

rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods
ClosedPublic

Authored by Alphare on Apr 6 2022, 10:13 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGfb123413e569: rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods
rHG19381e77b9ea: rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods
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

Event Timeline

Alphare created this revision.Apr 6 2022, 10:13 AM
marmoute accepted this revision.Apr 8 2022, 7:37 AM
marmoute added a subscriber: marmoute.

hooray

Alphare added a commit: rHG19381e77b9ea: rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods.Apr 8 2022, 11:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG19381e77b9ea: rust-dirstatemap: remove `set_dirstate_entry`/`set_entry` methods (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32945.Apr 8 2022, 12:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33047.Apr 12 2022, 10:58 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33129.Apr 12 2022, 12:06 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

Diff 33129

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))