This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11597

dirstate-item: drop the `merged` property
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:40 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc29d312657d2: dirstate-item: drop the `merged` property
Summary

It has no user anymore.

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, 8:40 PM
SimonSapin retitled this revision from dirstate-item: drop the `from_p2` property to dirstate-item: drop the `merged` property.Oct 3 2021, 6:20 AM
baymax updated this revision to Diff 30602.Oct 3 2021, 6:51 AM

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

Alphare accepted this revision.Oct 3 2021, 5:16 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:16 PM
marmoute added a commit: rHGc29d312657d2: dirstate-item: drop the `merged` property.Oct 3 2021, 5:36 PM
Closed by commit rHGc29d312657d2: dirstate-item: drop the `merged` property (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30655

mercurial/pure/parsers.py

def p2_info(self): def p2_info(self):
"""True if the file needed to merge or apply any input from p2 """True if the file needed to merge or apply any input from p2
See the class documentation for details. See the class documentation for details.
""" """
return self._wc_tracked and self._p2_info return self._wc_tracked and self._p2_info
@property @property
def merged(self):
"""True if the file has been merged
Should only be set if a merge is in progress in the dirstate
"""
return self._wc_tracked and self._p1_tracked and self._p2_info
@property
def removed(self): def removed(self):
"""True if the file has been removed""" """True if the file has been removed"""
return not self._wc_tracked and (self._p1_tracked or self._p2_info) return not self._wc_tracked and (self._p1_tracked or self._p2_info)
def v1_state(self): def v1_state(self):
"""return a "state" suitable for v1 serialization""" """return a "state" suitable for v1 serialization"""
if not self.any_tracked: if not self.any_tracked:
# the object has no state to record, this is -currently- # the object has no state to record, this is -currently-

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

pub fn removed(&self) -> bool { pub fn removed(&self) -> bool {
self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED) self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
} }
pub fn p2_info(&self) -> bool { pub fn p2_info(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO) self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
} }
pub fn merged(&self) -> bool {
self.flags
.contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
}
pub fn added(&self) -> bool { pub fn added(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent() self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
} }
pub fn maybe_clean(&self) -> bool { pub fn maybe_clean(&self) -> bool {
if !self.flags.contains(Flags::WDIR_TRACKED) { if !self.flags.contains(Flags::WDIR_TRACKED) {
false false
} else if !self.flags.contains(Flags::P1_TRACKED) { } else if !self.flags.contains(Flags::P1_TRACKED) {

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

@property @property
def p2_info(&self) -> PyResult<bool> { def p2_info(&self) -> PyResult<bool> {
Ok(self.entry(py).get().p2_info()) Ok(self.entry(py).get().p2_info())
} }
@property @property
def merged(&self) -> PyResult<bool> {
Ok(self.entry(py).get().merged())
}
@property
def removed(&self) -> PyResult<bool> { def removed(&self) -> PyResult<bool> {
Ok(self.entry(py).get().removed()) Ok(self.entry(py).get().removed())
} }
@property @property
def maybe_clean(&self) -> PyResult<bool> { def maybe_clean(&self) -> PyResult<bool> {
Ok(self.entry(py).get().maybe_clean()) Ok(self.entry(py).get().maybe_clean())
} }