( )⚙ D11579 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11579

dirstate-item: implement `drop_merge_data` on the Rust DirstateItem
ClosedPublic

Authored by marmoute on Oct 2 2021, 11:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3c7db97ce541: dirstate-item: implement `drop_merge_data` on the Rust DirstateItem
Summary

It was currently missing and we want to be able to use in it the Rust case too.

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

marmoute created this revision.Oct 2 2021, 11:05 AM
Alphare accepted this revision.Oct 3 2021, 4:33 PM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
rust/hg-core/src/dirstate/entry.rs
273

I'm assuming that is a premise to us realizing those are redundant in a way

This revision is now accepted and ready to land.Oct 3 2021, 4:33 PM

Revision Contents
Changeset List

Diff 30636

rust/hg-core/src/dirstate/entry.rs

MTIME_UNSET MTIME_UNSET
} else if self.from_p2() { } else if self.from_p2() {
MTIME_UNSET MTIME_UNSET
} else { } else {
self.mtime self.mtime
} }
} }
pub fn drop_merge_data(&mut self) {
if self.flags.contains(Flags::CLEAN_P1)
|| self.flags.contains(Flags::CLEAN_P2)
|| self.flags.contains(Flags::MERGED)
|| self.flags.contains(Flags::P2_TRACKED)
{
if self.flags.contains(Flags::MERGED) {
self.flags.insert(Flags::P1_TRACKED);
AlphareUnsubmitted
Not Done

I'm assuming that is a premise to us realizing those are redundant in a way

Alphare: I'm assuming that is a premise to us realizing those are redundant in a way
} else {
self.flags.remove(Flags::P1_TRACKED);
}
self.flags.remove(
Flags::MERGED
| Flags::CLEAN_P1
| Flags::CLEAN_P2
| Flags::P2_TRACKED,
);
self.flags.insert(Flags::POSSIBLY_DIRTY);
self.mode = 0;
self.mtime = 0;
// size = None on the python size turn into size = NON_NORMAL when
// accessed. So the next line is currently required, but a some
// future clean up would be welcome.
self.size = SIZE_NON_NORMAL;
}
}
pub fn set_possibly_dirty(&mut self) { pub fn set_possibly_dirty(&mut self) {
self.flags.insert(Flags::POSSIBLY_DIRTY) self.flags.insert(Flags::POSSIBLY_DIRTY)
} }
pub fn set_clean(&mut self, mode: i32, size: i32, mtime: i32) { pub fn set_clean(&mut self, mode: i32, size: i32, mtime: i32) {
self.flags.insert(Flags::WDIR_TRACKED | Flags::P1_TRACKED); self.flags.insert(Flags::WDIR_TRACKED | Flags::P1_TRACKED);
self.flags.remove( self.flags.remove(
Flags::P2_TRACKED // This might be wrong Flags::P2_TRACKED // This might be wrong

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

} }
@classmethod @classmethod
def new_normal(_cls, mode: i32, size: i32, mtime: i32) -> PyResult<Self> { def new_normal(_cls, mode: i32, size: i32, mtime: i32) -> PyResult<Self> {
let entry = DirstateEntry::new_normal(mode, size, mtime); let entry = DirstateEntry::new_normal(mode, size, mtime);
DirstateItem::create_instance(py, Cell::new(entry)) DirstateItem::create_instance(py, Cell::new(entry))
} }
def drop_merge_data(&self) -> PyResult<PyNone> {
self.update(py, |entry| entry.drop_merge_data());
Ok(PyNone)
}
def set_clean( def set_clean(
&self, &self,
mode: i32, mode: i32,
size: i32, size: i32,
mtime: i32, mtime: i32,
) -> PyResult<PyNone> { ) -> PyResult<PyNone> {
self.update(py, |entry| entry.set_clean(mode, size, mtime)); self.update(py, |entry| entry.set_clean(mode, size, mtime));
Ok(PyNone) Ok(PyNone)