This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12450

dirstatemap: move `set_tracked` out of common methods and plug in Rust
ClosedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGf1adbfa58dc3: dirstatemap: move `set_tracked` out of common methods and plug in Rust
rHG76c9c2345bef: dirstatemap: move `set_tracked` out of common methods and plug in Rust
Summary

We now have a Rust-specific implementation of this method, it is no longer
shared between both implementations.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Apr 6 2022, 10:11 AM
marmoute accepted this revision.Apr 8 2022, 6:55 AM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
rust/hg-cpython/src/dirstate/dirstate_map.rs
134–146

That 12 line one liner seems correct. (however 12 lines…)

Alphare added a commit: rHG76c9c2345bef: dirstatemap: move `set_tracked` out of common methods and plug in Rust.Apr 8 2022, 11:55 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG76c9c2345bef: dirstatemap: move `set_tracked` out of common methods and plug in Rust (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32922.Apr 8 2022, 12:29 PM

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

baymax updated this revision to Diff 33024.Apr 12 2022, 10:57 AM

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

baymax updated this revision to Diff 33104.Apr 12 2022, 12:05 PM

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

Revision Contents
Changeset List

Diff 32886

mercurial/dirstatemap.py

def set_clean(self, filename, mode, size, mtime): def set_clean(self, filename, mode, size, mtime):
"""mark a file as back to a clean state""" """mark a file as back to a clean state"""
entry = self[filename] entry = self[filename]
size = size & rangemask size = size & rangemask
entry.set_clean(mode, size, mtime) entry.set_clean(mode, size, mtime)
self._refresh_entry(filename, entry) self._refresh_entry(filename, entry)
self.copymap.pop(filename, None) self.copymap.pop(filename, None)
def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self._dirs_incr(filename)
entry = DirstateItem(
wc_tracked=True,
)
self._insert_entry(filename, entry)
new = True
elif not entry.tracked:
self._dirs_incr(filename, entry)
entry.set_tracked()
self._refresh_entry(filename, entry)
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
entry.set_possibly_dirty()
self._refresh_entry(filename, entry)
return new
def set_untracked(self, f): def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map""" """Mark a file as no longer tracked in the dirstate map"""
entry = self.get(f) entry = self.get(f)
if entry is None: if entry is None:
return False return False
else: else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.p2_info: if not entry.p2_info:
return pathutil.dirs(self._map, only_tracked=True) return pathutil.dirs(self._map, only_tracked=True)
@propertycache @propertycache
def _alldirs(self): def _alldirs(self):
return pathutil.dirs(self._map) return pathutil.dirs(self._map)
### code related to manipulation of entries and copy-sources ### code related to manipulation of entries and copy-sources
def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self._dirs_incr(filename)
entry = DirstateItem(
wc_tracked=True,
)
self._insert_entry(filename, entry)
new = True
elif not entry.tracked:
self._dirs_incr(filename, entry)
entry.set_tracked()
self._refresh_entry(filename, entry)
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
entry.set_possibly_dirty()
self._refresh_entry(filename, entry)
return new
def _refresh_entry(self, f, entry): def _refresh_entry(self, f, entry):
if not entry.any_tracked: if not entry.any_tracked:
self._map.pop(f, None) self._map.pop(f, None)
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
self._map[f] = entry self._map[f] = entry
def _drop_entry(self, f): def _drop_entry(self, f):
if not entry.any_tracked: if not entry.any_tracked:
self._map.drop_item_and_copy_source(f) self._map.drop_item_and_copy_source(f)
else: else:
self._map.addfile(f, entry) self._map.addfile(f, entry)
def _insert_entry(self, f, entry): def _insert_entry(self, f, entry):
self._map.addfile(f, entry) self._map.addfile(f, entry)
def set_tracked(self, f):
return self._map.set_tracked(f)
def _drop_entry(self, f): def _drop_entry(self, f):
self._map.drop_item_and_copy_source(f) self._map.drop_item_and_copy_source(f)
def __setitem__(self, key, value): def __setitem__(self, key, value):
assert isinstance(value, DirstateItem) assert isinstance(value, DirstateItem)
self._map.set_dirstate_item(key, value) self._map.set_dirstate_item(key, value)

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

let entry = item.get_entry(py); let entry = item.get_entry(py);
self.inner(py) self.inner(py)
.borrow_mut() .borrow_mut()
.add_file(filename, entry) .add_file(filename, entry)
.map_err(|e |dirstate_error(py, e))?; .map_err(|e |dirstate_error(py, e))?;
Ok(PyNone) Ok(PyNone)
} }
def set_tracked(&self, f: PyObject) -> PyResult<PyBool> {
Ok(self.inner(py).borrow_mut()
.set_tracked(
HgPath::new(f.extract::<PyBytes>(py)?.data(py)),
)
.or_else(|_| {
Err(PyErr::new::<exc::OSError, _>(
py,
"Dirstate error".to_string(),
))
})?.to_py_object(py))
}
marmouteUnsubmitted
Not Done

That 12 line one liner seems correct. (however 12 lines…)

marmoute: That 12 line one liner seems correct. (however 12 lines…)
def removefile( def removefile(
&self, &self,
f: PyObject, f: PyObject,
in_merge: PyObject in_merge: PyObject
) -> PyResult<PyObject> { ) -> PyResult<PyObject> {
self.inner(py).borrow_mut() self.inner(py).borrow_mut()
.remove_file( .remove_file(
HgPath::new(f.extract::<PyBytes>(py)?.data(py)), HgPath::new(f.extract::<PyBytes>(py)?.data(py)),