# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2017-05-30 17:27:20
# Node ID c37ca35b845071fafe6de43172ab6c7c129a2ab5
# Parent  2af0b9a02bf99a52e8f6ec8fd2dce1268bcce24a

hidden: subtract pinned revs from hidden earlier

The pinned revs are simply revisions that should not be hidden even if
hideablerevs() says that should. Let's make that clear by simply
setting "hidden = hideablerevs() - pinnedrevs()" early on.

diff --git a/mercurial/repoview.py b/mercurial/repoview.py
--- a/mercurial/repoview.py
+++ b/mercurial/repoview.py
@@ -71,14 +71,13 @@ def computehidden(repo):
 
     hidden = hideablerevs(repo)
     if hidden:
+        hidden = set(hidden - pinnedrevs(repo))
         pfunc = repo.changelog.parentrevs
         mutablephases = (phases.draft, phases.secret)
         mutable = repo._phasecache.getrevset(repo, mutablephases)
 
         visible = set(mutable - hidden)
-        visible |= (hidden & pinnedrevs(repo))
         if visible:
-            hidden = hidden - visible
             _revealancestors(pfunc, hidden, visible)
     return frozenset(hidden)