diff -r 169d66db5920 -r 0c1aff6d73a7 mercurial/phases.py --- a/mercurial/phases.py Fri Dec 08 16:14:19 2017 -0500 +++ b/mercurial/phases.py Fri Dec 08 14:20:34 2017 -0800 @@ -208,7 +208,7 @@ self.filterunknown(repo) self.opener = repo.svfs - def getrevset(self, repo, phases): + def getrevset(self, repo, phases, subset=None): """return a smartset for the given phases""" self.loadphaserevs(repo) # ensure phase's sets are loaded phases = set(phases) @@ -222,7 +222,10 @@ revs = set.union(*[self._phasesets[p] for p in phases]) if repo.changelog.filteredrevs: revs = revs - repo.changelog.filteredrevs - return smartset.baseset(revs) + if subset is None: + return smartset.baseset(revs) + else: + return subset & smartset.baseset(revs) else: phases = set(allphases).difference(phases) if not phases: @@ -232,9 +235,11 @@ revs = self._phasesets[p] else: revs = set.union(*[self._phasesets[p] for p in phases]) + if subset is None: + subset = smartset.fullreposet(repo) if not revs: - return smartset.fullreposet(repo) - return smartset.fullreposet(repo).filter(lambda r: r not in revs) + return subset + return subset.filter(lambda r: r not in revs) def copy(self): # Shallow copy meant to ensure isolation in