# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2017-12-22 16:49:42 # Node ID 3c9c05a38d78a54c21cb0f397099a3dafd69547f # Parent 3ad582b2895cfd814bd9383d49256483caa20229 repoview: add visibilityexception argument to filterrevs() and related fns After this patch, filterrevs() can take an optional argument visibilityexceptions which is a set of revs which should be exception to being hidden. The visibilityexceptions will be passed to the function computing hidden revisions for that filtername and are considered there while calculating the set of hidden revs. Differential Revision: https://phab.mercurial-scm.org/D1747 diff --git a/mercurial/repoview.py b/mercurial/repoview.py --- a/mercurial/repoview.py +++ b/mercurial/repoview.py @@ -65,7 +65,7 @@ def _revealancestors(pfunc, hidden, revs hidden.remove(p) stack.append(p) -def computehidden(repo): +def computehidden(repo, visibilityexceptions=None): """compute the set of hidden revision to filter During most operation hidden should be filtered.""" @@ -74,6 +74,8 @@ def computehidden(repo): hidden = hideablerevs(repo) if hidden: hidden = set(hidden - pinnedrevs(repo)) + if visibilityexceptions: + hidden -= visibilityexceptions pfunc = repo.changelog.parentrevs mutablephases = (phases.draft, phases.secret) mutable = repo._phasecache.getrevset(repo, mutablephases) @@ -82,7 +84,7 @@ def computehidden(repo): _revealancestors(pfunc, hidden, visible) return frozenset(hidden) -def computeunserved(repo): +def computeunserved(repo, visibilityexceptions=None): """compute the set of revision that should be filtered when used a server Secret and hidden changeset should not pretend to be here.""" @@ -100,7 +102,7 @@ def computeunserved(repo): else: return hiddens -def computemutable(repo): +def computemutable(repo, visibilityexceptions=None): assert not repo.changelog.filteredrevs # fast check to avoid revset call on huge repo if any(repo._phasecache.phaseroots[1:]): @@ -109,7 +111,7 @@ def computemutable(repo): return frozenset(r for r in maymutable if getphase(repo, r)) return frozenset() -def computeimpactable(repo): +def computeimpactable(repo, visibilityexceptions=None): """Everything impactable by mutable revision The immutable filter still have some chance to get invalidated. This will @@ -145,10 +147,16 @@ filtertable = {'visible': computehidden, 'immutable': computemutable, 'base': computeimpactable} -def filterrevs(repo, filtername): - """returns set of filtered revision for this filter name""" +def filterrevs(repo, filtername, visibilityexceptions=None): + """returns set of filtered revision for this filter name + + visibilityexceptions is a set of revs which must are exceptions for + hidden-state and must be visible. They are dynamic and hence we should not + cache it's result""" if filtername not in repo.filteredrevcache: func = filtertable[filtername] + if visibilityexceptions: + return func(repo.unfiltered, visibilityexceptions) repo.filteredrevcache[filtername] = func(repo.unfiltered()) return repo.filteredrevcache[filtername] @@ -210,7 +218,7 @@ class repoview(object): unfilen = len(unfiindex) - 1 unfinode = unfiindex[unfilen - 1][7] - revs = filterrevs(unfi, self.filtername) + revs = filterrevs(unfi, self.filtername, self._visibilityexceptions) cl = self._clcache newkey = (unfilen, unfinode, hash(revs), unfichangelog._delayed) # if cl.index is not unfiindex, unfi.changelog would be