Show More
@@ -9,7 +9,7 b'' | |||
|
9 | 9 | import copy |
|
10 | 10 | import phases |
|
11 | 11 | import util |
|
12 |
import obsolete |
|
|
12 | import obsolete | |
|
13 | 13 | |
|
14 | 14 | |
|
15 | 15 | def hideablerevs(repo): |
@@ -28,8 +28,9 b' def computehidden(repo):' | |||
|
28 | 28 | cl = repo.changelog |
|
29 | 29 | firsthideable = min(hideable) |
|
30 | 30 | revs = cl.revs(start=firsthideable) |
|
31 | blockers = [r for r in revset._children(repo, revs, hideable) | |
|
32 | if r not in hideable] | |
|
31 | tofilter = repo.revs( | |
|
32 | '(%ld) and children(%ld)', list(revs), list(hideable)) | |
|
33 | blockers = [r for r in tofilter if r not in hideable] | |
|
33 | 34 | for par in repo[None].parents(): |
|
34 | 35 | blockers.append(par.rev()) |
|
35 | 36 | for bm in repo._bookmarks.values(): |
@@ -38,5 +38,4 b' these may expose other cycles.' | |||
|
38 | 38 | mercurial/ui.py mixed imports |
|
39 | 39 | stdlib: formatter |
|
40 | 40 | relative: config, error, scmutil, util |
|
41 | Import cycle: mercurial.repoview -> mercurial.revset -> mercurial.repoview | |
|
42 | 41 | Import cycle: mercurial.cmdutil -> mercurial.context -> mercurial.subrepo -> mercurial.cmdutil -> mercurial.cmdutil |
General Comments 0
You need to be logged in to leave comments.
Login now