facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

repoview: use repo.revs() instead of a private revset method

Browse Source 
Breaks an import cycle.
This commit is contained in:
Augie Fackler 2014-02-04 17:13:45 -05:00
parent 888bc814fa
commit 859551f9b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/repoview.py
View File

@ -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():

1
tests/test-module-imports.t
View File

@ -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