( )⚙ D11595 dirstate-item: replace a `merged` usage with `from_p2`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11595

dirstate-item: replace a `merged` usage with `from_p2`
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe0b4e4f80fff: dirstate-item: replace a `merged` usage with `p2_info`
Summary

It seems more accurate and no test complains (XXX hopefully XXX).

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 30600.Oct 3 2021, 6:51 AM

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

Alphare added a subscriber: Alphare.Oct 3 2021, 5:15 PM

The commit message says from_p2, but it's p2_info. I'll amend on-the-fly

marmoute added a commit: rHGe0b4e4f80fff: dirstate-item: replace a `merged` usage with `p2_info`.Oct 3 2021, 5:36 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe0b4e4f80fff: dirstate-item: replace a `merged` usage with `p2_info` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (2 lines)

Diff 30653

mercurial/dirstatemap.py

def set_untracked(self, f): def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map""" """Mark a file as no longer tracked in the dirstate map"""
entry = self.get(f) entry = self.get(f)
if entry is None: if entry is None:
return False return False
else: else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added) self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.merged: if not entry.p2_info:
self.copymap.pop(f, None) self.copymap.pop(f, None)
entry.set_untracked() entry.set_untracked()
self._refresh_entry(f, entry) self._refresh_entry(f, entry)
return True return True
def reset_state( def reset_state(
self, self,
filename, filename,