From patchwork Sun May 28 06:15:30 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2,of,8] hidden: rename "revealedrevs" to "anchorrevs"
From: via Mercurial-devel <mercurial-devel@mercurial-scm.org>
X-Patchwork-Id: 20967
Message-Id: <a0434758fd9a95ea3807.1495952130@martinvonz.svl.corp.google.com>
To: mercurial-devel@mercurial-scm.org
Cc: Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Date: Sat, 27 May 2017 23:15:30 -0700

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1495944531 25200
#      Sat May 27 21:08:51 2017 -0700
# Node ID a0434758fd9a95ea3807ff4766eaedff6852c628
# Parent  36e6d5d9737962c3a1ec1eef1ef5ebb0a374ffd5
hidden: rename "revealedrevs" to "anchorrevs"

E.g. tags and bookmarks can reveal revisions that would otherwise be
hidden. A revision can also be revealed because one if its descendants
is visible. Let's use the term "anchors" for the former case
(bookmarks etc.).

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1537,4 +1537,4 @@
     cmdutil.afterresolvedstates.append(
         ['rebasestate', _('hg rebase --continue')])
     # ensure rebased rev are not hidden
-    extensions.wrapfunction(repoview, 'revealedrevs', _rebasedvisible)
+    extensions.wrapfunction(repoview, 'anchorrevs', _rebasedvisible)
diff --git a/mercurial/repoview.py b/mercurial/repoview.py
--- a/mercurial/repoview.py
+++ b/mercurial/repoview.py
@@ -28,21 +28,21 @@
     lead to crashes."""
     return obsolete.getrevs(repo, 'obsolete')
 
-def revealedrevs(repo):
+def anchorrevs(repo):
     """revisions blocking hidden changesets from being filtered
     """
 
     cl = repo.changelog
-    blockers = set()
-    blockers.update([par.rev() for par in repo[None].parents()])
-    blockers.update([cl.rev(bm) for bm in repo._bookmarks.values()])
+    anchors = set()
+    anchors.update([par.rev() for par in repo[None].parents()])
+    anchors.update([cl.rev(bm) for bm in repo._bookmarks.values()])
 
     tags = {}
     tagsmod.readlocaltags(repo.ui, repo, tags, {})
     if tags:
         rev, nodemap = cl.rev, cl.nodemap
-        blockers.update(rev(t[0]) for t in tags.values() if t[0] in nodemap)
-    return blockers
+        anchors.update(rev(t[0]) for t in tags.values() if t[0] in nodemap)
+    return anchors
 
 def _consistencyblocker(pfunc, hideable, domain):
     """return non-hideable changeset blocking hideable one
@@ -112,7 +112,7 @@
 
         # check if we have wd parents, bookmarks or tags pointing to hidden
         # changesets and remove those.
-        blockers |= (hidden & revealedrevs(repo))
+        blockers |= (hidden & anchorrevs(repo))
         if blockers:
             hidden = hidden - _domainancestors(pfunc, blockers, mutable)
     return frozenset(hidden)