This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11510

dirstate: drop unused condition in `from_p2`
ClosedPublic

Authored by marmoute on Sep 29 2021, 4:36 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG46d1b75648f4: dirstate: drop unused condition in `from_p2`
Summary

This conditional was added (by me) tentatively because "it seemed more
correct", but it is not used anywhere yet, and it is missing from the C and the
Rust implementation. So it seems more consistent to drop it for now.

This effectively backout f94cc63df859c

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.Sep 29 2021, 4:36 AM
Alphare accepted this revision.Sep 29 2021, 4:55 AM
Alphare added a subscriber: Alphare.

Sure I guess

This revision is now accepted and ready to land.Sep 29 2021, 4:55 AM
marmoute added a commit: rHG46d1b75648f4: dirstate: drop unused condition in `from_p2`.Oct 1 2021, 9:18 AM
Closed by commit rHG46d1b75648f4: dirstate: drop unused condition in `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 (2 lines)

Diff 30480

mercurial/pure/parsers.py

"""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
""" """
if not self._wc_tracked: if not self._wc_tracked:
return False return False
return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) return self._clean_p2
@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.
""" """