This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11594

dirstate-item: drop the `from_p2` property
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd71feb05d5b6: dirstate-item: drop the `from_p2` 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
baymax updated this revision to Diff 30599.Oct 3 2021, 6:51 AM

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

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

Revision Contents
Changeset List

Diff 30652

mercurial/pure/parsers.py

def merged(self): def merged(self):
"""True if the file has been merged """True if the file has been merged
Should only be set if a merge is in progress in the dirstate 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 return self._wc_tracked and self._p1_tracked and self._p2_info
@property @property
def from_p2(self):
"""True if the file have been fetched from p2 during the current merge
This is only True is the file is currently tracked.
Should only be set if a merge is in progress in the dirstate
"""
return self._wc_tracked and (not 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

self.flags self.flags
.contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO) .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 from_p2(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
&& !self.flags.contains(Flags::P1_TRACKED)
}
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) {
false false
} else if self.flags.contains(Flags::P2_INFO) { } else if self.flags.contains(Flags::P2_INFO) {
false false
} else { } else {

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

} }
@property @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 from_p2(&self) -> PyResult<bool> {
Ok(self.entry(py).get().from_p2())
}
@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())
} }
@property @property
def any_tracked(&self) -> PyResult<bool> { def any_tracked(&self) -> PyResult<bool> {
Ok(self.entry(py).get().any_tracked()) Ok(self.entry(py).get().any_tracked())
} }