Show More
@@ -1537,4 +1537,4 b' def uisetup(ui):' | |||||
1537 | cmdutil.afterresolvedstates.append( |
|
1537 | cmdutil.afterresolvedstates.append( | |
1538 | ['rebasestate', _('hg rebase --continue')]) |
|
1538 | ['rebasestate', _('hg rebase --continue')]) | |
1539 | # ensure rebased rev are not hidden |
|
1539 | # ensure rebased rev are not hidden | |
1540 |
extensions.wrapfunction(repoview, ' |
|
1540 | extensions.wrapfunction(repoview, 'revealedrevs', _rebasedvisible) |
@@ -32,7 +32,7 b' def hideablerevs(repo):' | |||||
32 | lead to crashes.""" |
|
32 | lead to crashes.""" | |
33 | return obsolete.getrevs(repo, 'obsolete') |
|
33 | return obsolete.getrevs(repo, 'obsolete') | |
34 |
|
34 | |||
35 | def _getdynamicblockers(repo): |
|
35 | def revealedrevs(repo): | |
36 | """Non-cacheable revisions blocking hidden changesets from being filtered. |
|
36 | """Non-cacheable revisions blocking hidden changesets from being filtered. | |
37 |
|
37 | |||
38 | Get revisions that will block hidden changesets and are likely to change, |
|
38 | Get revisions that will block hidden changesets and are likely to change, | |
@@ -185,7 +185,7 b' def computehidden(repo):' | |||||
185 |
|
185 | |||
186 | # check if we have wd parents, bookmarks or tags pointing to hidden |
|
186 | # check if we have wd parents, bookmarks or tags pointing to hidden | |
187 | # changesets and remove those. |
|
187 | # changesets and remove those. | |
188 |
dynamic = hidden & |
|
188 | dynamic = hidden & revealedrevs(repo) | |
189 | if dynamic: |
|
189 | if dynamic: | |
190 | blocked = cl.ancestors(dynamic, inclusive=True) |
|
190 | blocked = cl.ancestors(dynamic, inclusive=True) | |
191 | hidden = frozenset(r for r in hidden if r not in blocked) |
|
191 | hidden = frozenset(r for r in hidden if r not in blocked) |
General Comments 0
You need to be logged in to leave comments.
Login now