Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: define an official tuple of phases we do not share
authorBoris Feld <boris.feld@octobus.net>
Tue, 22 May 2018 18:10:37 +0200
changeset 38158 4e790f0966fc
parent 38157 02f992ac26e9
child 38159 dea3903175ee
phases: define an official tuple of phases we do not share Same motivation as for `mutablephases`, having a single definition helps with updating phases logic.
mercurial/phases.py file | annotate | diff | comparison | revisions
mercurial/repoview.py file | annotate | diff | comparison | revisions 
--- a/mercurial/phases.py	Tue May 22 18:10:00 2018 +0200
+++ b/mercurial/phases.py	Tue May 22 18:10:37 2018 +0200
@@ -127,6 +127,7 @@
 trackedphases = allphases[1:]
 phasenames = ['public', 'draft', 'secret']
 mutablephases = tuple(allphases[1:])
+remotehiddenphases = tuple(allphases[2:])
 
 def _readroots(repo, phasedefaults=None):
     """Read phase roots from disk
--- a/mercurial/repoview.py	Tue May 22 18:10:00 2018 +0200
+++ b/mercurial/repoview.py	Tue May 22 18:10:37 2018 +0200
@@ -91,8 +91,8 @@
     # fast path in simple case to avoid impact of non optimised code
     hiddens = filterrevs(repo, 'visible')
     if phases.hassecret(repo):
-        secrets = frozenset(repo._phasecache.getrevset(repo, (phases.secret,)))
-        return frozenset(hiddens | secrets)
+        secrets = repo._phasecache.getrevset(repo, phases.remotehiddenphases)
+        return frozenset(hiddens | frozenset(secrets))
     else:
         return hiddens
mercurial