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, 'pinnedrevs', _rebasedvisible) |
@@ -28,21 +28,21 b' def hideablerevs(repo):' | |||||
28 | lead to crashes.""" |
|
28 | lead to crashes.""" | |
29 | return obsolete.getrevs(repo, 'obsolete') |
|
29 | return obsolete.getrevs(repo, 'obsolete') | |
30 |
|
30 | |||
31 |
def |
|
31 | def pinnedrevs(repo): | |
32 | """revisions blocking hidden changesets from being filtered |
|
32 | """revisions blocking hidden changesets from being filtered | |
33 | """ |
|
33 | """ | |
34 |
|
34 | |||
35 | cl = repo.changelog |
|
35 | cl = repo.changelog | |
36 |
|
|
36 | pinned = set() | |
37 |
|
|
37 | pinned.update([par.rev() for par in repo[None].parents()]) | |
38 |
|
|
38 | pinned.update([cl.rev(bm) for bm in repo._bookmarks.values()]) | |
39 |
|
39 | |||
40 | tags = {} |
|
40 | tags = {} | |
41 | tagsmod.readlocaltags(repo.ui, repo, tags, {}) |
|
41 | tagsmod.readlocaltags(repo.ui, repo, tags, {}) | |
42 | if tags: |
|
42 | if tags: | |
43 | rev, nodemap = cl.rev, cl.nodemap |
|
43 | rev, nodemap = cl.rev, cl.nodemap | |
44 |
|
|
44 | pinned.update(rev(t[0]) for t in tags.values() if t[0] in nodemap) | |
45 |
return |
|
45 | return pinned | |
46 |
|
46 | |||
47 | def _consistencyblocker(pfunc, hideable, domain): |
|
47 | def _consistencyblocker(pfunc, hideable, domain): | |
48 | """return non-hideable changeset blocking hideable one |
|
48 | """return non-hideable changeset blocking hideable one | |
@@ -112,7 +112,7 b' def computehidden(repo):' | |||||
112 |
|
112 | |||
113 | # check if we have wd parents, bookmarks or tags pointing to hidden |
|
113 | # check if we have wd parents, bookmarks or tags pointing to hidden | |
114 | # changesets and remove those. |
|
114 | # changesets and remove those. | |
115 |
blockers |= (hidden & |
|
115 | blockers |= (hidden & pinnedrevs(repo)) | |
116 | if blockers: |
|
116 | if blockers: | |
117 | hidden = hidden - _domainancestors(pfunc, blockers, mutable) |
|
117 | hidden = hidden - _domainancestors(pfunc, blockers, mutable) | |
118 | return frozenset(hidden) |
|
118 | return frozenset(hidden) |
General Comments 0
You need to be logged in to leave comments.
Login now