This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7854

phases: make phasecache._phasesets immutable
ClosedPublic

Authored by rdamazio on Jan 13 2020, 10:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGab41dad7345e: phases: make phasecache._phasesets immutable
rHGa30a59582c15: phases: make phasecache._phasesets immutable
rHGc31ec768d70a: phases: make phasecache._phasesets immutable
Summary

Previously, some code paths would mutate the cache itself, which
could give weird results if multiple revsets got evaluated through
that path.

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

rdamazio created this revision.Jan 13 2020, 10:18 PM
rdamazio added a commit: rHGc31ec768d70a: phases: make phasecache._phasesets immutable.Jan 14 2020, 9:21 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc31ec768d70a: phases: make phasecache._phasesets immutable (authored by rdamazio). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/phases.py (4 lines)

Diff 19206

mercurial/phases.py

if publicphase: if publicphase:
# In this case, phases keeps all the *other* phases. # In this case, phases keeps all the *other* phases.
phases = set(allphases).difference(phases) phases = set(allphases).difference(phases)
if not phases: if not phases:
return smartset.fullreposet(repo) return smartset.fullreposet(repo)
# fast path: _phasesets contains the interesting sets, # fast path: _phasesets contains the interesting sets,
# might only need a union and post-filtering. # might only need a union and post-filtering.
revsneedscopy = False
if len(phases) == 1: if len(phases) == 1:
[p] = phases [p] = phases
revs = self._phasesets[p] revs = self._phasesets[p]
revsneedscopy = True # Don't modify _phasesets
else: else:
# revs has the revisions in all *other* phases. # revs has the revisions in all *other* phases.
revs = set.union(*[self._phasesets[p] for p in phases]) revs = set.union(*[self._phasesets[p] for p in phases])
def _addwdir(wdirsubset, wdirrevs): def _addwdir(wdirsubset, wdirrevs):
if wdirrev in wdirsubset and repo[None].phase() in phases: if wdirrev in wdirsubset and repo[None].phase() in phases:
if revsneedscopy:
wdirrevs = wdirrevs.copy()
# The working dir would never be in the # cache, but it was in # The working dir would never be in the # cache, but it was in
# the subset being filtered for its phase (or filtered out, # the subset being filtered for its phase (or filtered out,
# depending on publicphase), so add it to the output to be # depending on publicphase), so add it to the output to be
# included (or filtered out). # included (or filtered out).
wdirrevs.add(wdirrev) wdirrevs.add(wdirrev)
return wdirrevs return wdirrevs
if not publicphase: if not publicphase: