Show More
@@ -35,6 +35,9 b' def computehidden(repo):' | |||||
35 | blockers.append(par.rev()) |
|
35 | blockers.append(par.rev()) | |
36 | for bm in repo._bookmarks.values(): |
|
36 | for bm in repo._bookmarks.values(): | |
37 | blockers.append(repo[bm].rev()) |
|
37 | blockers.append(repo[bm].rev()) | |
|
38 | tags = [n for t, n in repo.tags().iteritems() | |||
|
39 | if (repo.tagtype(t) and repo.tagtype(t) != 'global')] | |||
|
40 | blockers.extend(repo[t].rev() for t in tags) | |||
38 | blocked = cl.ancestors(blockers, inclusive=True) |
|
41 | blocked = cl.ancestors(blockers, inclusive=True) | |
39 | return frozenset(r for r in hideable if r not in blocked) |
|
42 | return frozenset(r for r in hideable if r not in blocked) | |
40 | return frozenset() |
|
43 | return frozenset() |
@@ -884,4 +884,20 b' This test issue 3814' | |||||
884 | no changes found |
|
884 | no changes found | |
885 | [1] |
|
885 | [1] | |
886 |
|
886 | |||
|
887 | Test that a local tag blocks a changeset from being hidden | |||
887 |
|
888 | |||
|
889 | $ hg tag -l visible -r 0 --hidden | |||
|
890 | $ hg log -G | |||
|
891 | @ changeset: 2:3816541e5485 | |||
|
892 | tag: tip | |||
|
893 | parent: -1:000000000000 | |||
|
894 | user: test | |||
|
895 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
896 | summary: A | |||
|
897 | ||||
|
898 | x changeset: 0:193e9254ce7e | |||
|
899 | tag: visible | |||
|
900 | user: test | |||
|
901 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
902 | summary: A | |||
|
903 |
General Comments 0
You need to be logged in to leave comments.
Login now