From 859551f9b1a1c338650d7dee400414ccbbb6bcad Mon Sep 17 00:00:00 2001
From: Augie Fackler <raf@durin42.com>
Date: Tue, 4 Feb 2014 17:13:45 -0500
Subject: [PATCH] repoview: use repo.revs() instead of a private revset method

Breaks an import cycle.
---
 mercurial/repoview.py       | 7 ++++---
 tests/test-module-imports.t | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mercurial/repoview.py b/mercurial/repoview.py
index b238999013..dfd0a9c9a7 100644
--- a/mercurial/repoview.py
+++ b/mercurial/repoview.py
@@ -9,7 +9,7 @@
 import copy
 import phases
 import util
-import obsolete, revset
+import obsolete
 
 
 def hideablerevs(repo):
@@ -28,8 +28,9 @@ def computehidden(repo):
         cl = repo.changelog
         firsthideable = min(hideable)
         revs = cl.revs(start=firsthideable)
-        blockers = [r for r in revset._children(repo, revs, hideable)
-                      if r not in hideable]
+        tofilter = repo.revs(
+            '(%ld) and children(%ld)', list(revs), list(hideable))
+        blockers = [r for r in tofilter if r not in hideable]
         for par in repo[None].parents():
             blockers.append(par.rev())
         for bm in repo._bookmarks.values():
diff --git a/tests/test-module-imports.t b/tests/test-module-imports.t
index ac1ba0703a..aec8c0d1d4 100644
--- a/tests/test-module-imports.t
+++ b/tests/test-module-imports.t
@@ -38,5 +38,4 @@ these may expose other cycles.
   mercurial/ui.py mixed imports
      stdlib:    formatter
      relative:  config, error, scmutil, util
-  Import cycle: mercurial.repoview -> mercurial.revset -> mercurial.repoview
   Import cycle: mercurial.cmdutil -> mercurial.context -> mercurial.subrepo -> mercurial.cmdutil -> mercurial.cmdutil