This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9111

changing-files: always use `mark_touched` to update the touched set
ClosedPublic

Authored by marmoute on Sep 28 2020, 12:32 PM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHG42bb6c4f8106: changing-files: always use `mark_touched` to update the touched set
Summary

We use this function internally too because that will make cache invalidation
simpler.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Sep 28 2020, 12:32 PM
pulkit accepted this revision.Oct 1 2020, 10:34 AM
This revision is now accepted and ready to land.Oct 1 2020, 10:34 AM
Alphare accepted this revision.Oct 1 2020, 11:33 AM
marmoute updated this revision to Diff 22980.Oct 2 2020, 3:13 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/metadata.py (6 lines)

Diff 22900

mercurial/metadata.py

In case of merge, this means a file absent in one of the parents but In case of merge, this means a file absent in one of the parents but
existing in the other will *not* be contained in this set. (They were existing in the other will *not* be contained in this set. (They were
added by an ancestor) added by an ancestor)
""" """
return frozenset(self._added) return frozenset(self._added)
def mark_added(self, filename): def mark_added(self, filename):
self._added.add(filename) self._added.add(filename)
self._touched.add(filename) self.mark_touched(filename)
def update_added(self, filenames): def update_added(self, filenames):
for f in filenames: for f in filenames:
self.mark_added(f) self.mark_added(f)
@property @property
def merged(self): def merged(self):
"""files actively merged during a merge """files actively merged during a merge
Any modified files which had modification on both size that needed merging. Any modified files which had modification on both size that needed merging.
In this case a new filenode was created and it has two parents. In this case a new filenode was created and it has two parents.
""" """
return frozenset(self._merged) return frozenset(self._merged)
def mark_merged(self, filename): def mark_merged(self, filename):
self._merged.add(filename) self._merged.add(filename)
self._touched.add(filename) self.mark_touched(filename)
def update_merged(self, filenames): def update_merged(self, filenames):
for f in filenames: for f in filenames:
self.mark_merged(f) self.mark_merged(f)
@property @property
def removed(self): def removed(self):
"""files actively removed by the changeset """files actively removed by the changeset
(b) | one | none || yes (b) | one | none || yes
(c) | one | same filenode || no (c) | one | same filenode || no
(d) | one | new filenode || yes (d) | one | new filenode || yes
""" """
return frozenset(self._removed) return frozenset(self._removed)
def mark_removed(self, filename): def mark_removed(self, filename):
self._removed.add(filename) self._removed.add(filename)
self._touched.add(filename) self.mark_touched(filename)
def update_removed(self, filenames): def update_removed(self, filenames):
for f in filenames: for f in filenames:
self.mark_removed(f) self.mark_removed(f)
@property @property
def touched(self): def touched(self):
"""files either actively modified, added or removed""" """files either actively modified, added or removed"""