This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11372

dirstate-item: add more logic to `from_p2`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG97e9f3fd9324: dirstate-item: add more logic to `from_p2`
Summary

This seem semantically better even if this tracking case seems to always comes
with clean_p2 for now.

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:54 AM
Alphare added a subscriber: Alphare.

I was about to say something in the other patch about from_p2, good to see that we agree.

This revision is now accepted and ready to land.Aug 30 2021, 5:54 AM
baymax updated this revision to Diff 30149.Aug 30 2021, 9:00 AM

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

marmoute added a commit: rHG97e9f3fd9324: dirstate-item: add more logic to `from_p2`.Aug 30 2021, 9:05 AM
Closed by commit rHG97e9f3fd9324: dirstate-item: add more logic to `from_p2` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 30163

mercurial/pure/parsers.py

@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
""" """
return self._wc_tracked and self._clean_p2 if not self._wc_tracked:
return False
return self._clean_p2 or (not self._p1_tracked and self._p2_tracked)
@property @property
def from_p2_removed(self): def from_p2_removed(self):
"""True if the file has been removed, but was "from_p2" initially """True if the file has been removed, but was "from_p2" initially
This property seems like an abstraction leakage and should probably be This property seems like an abstraction leakage and should probably be
dealt in this class (or maybe the dirstatemap) directly. dealt in this class (or maybe the dirstatemap) directly.
""" """