This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11367

dirstate-item: implement `merged` in a simpler way
ClosedPublic

Authored by marmoute on Aug 27 2021, 1:11 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7c37d153c22d: dirstate-item: implement `merged` in a simpler way
Summary

We can simply use the underlying attribute.

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.Aug 27 2021, 1:11 PM
Alphare accepted this revision.Aug 30 2021, 5:51 AM
This revision is now accepted and ready to land.Aug 30 2021, 5:51 AM
baymax updated this revision to Diff 30144.Aug 30 2021, 9:00 AM

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

marmoute added a commit: rHG7c37d153c22d: dirstate-item: implement `merged` in a simpler way.Aug 30 2021, 9:05 AM
Closed by commit rHG7c37d153c22d: dirstate-item: implement `merged` in a simpler way (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)

Diff 30158

mercurial/pure/parsers.py

return self._wc_tracked and not (self._p1_tracked or self._p2_tracked) return self._wc_tracked and not (self._p1_tracked or self._p2_tracked)
@property @property
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.v1_state() == b'm' return self._wc_tracked and self._merged
@property @property
def from_p2(self): def from_p2(self):
"""True if the file have been fetched from p2 during the current merge """True if the file have been fetched from p2 during the current merge
This is only True is the file is currently tracked. This is only True is the file is currently tracked.
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