Show More
@@ -186,8 +186,10 b' class changelog(revlog.revlog):' | |||||
186 | return self._nodecache |
|
186 | return self._nodecache | |
187 |
|
187 | |||
188 | def reachableroots(self, minroot, heads, roots, includepath=False): |
|
188 | def reachableroots(self, minroot, heads, roots, includepath=False): | |
189 | return revset.baseset(sorted( |
|
189 | rroots = self.index.reachableroots2(minroot, heads, roots, includepath) | |
190 | self.index.reachableroots2(minroot, heads, roots, includepath))) |
|
190 | rroots = revset.baseset(rroots) | |
|
191 | rroots.sort() | |||
|
192 | return rroots | |||
191 |
|
193 | |||
192 | def headrevs(self): |
|
194 | def headrevs(self): | |
193 | if self.filteredrevs: |
|
195 | if self.filteredrevs: |
@@ -96,9 +96,9 b' Test SEGV caused by bad revision passed ' | |||||
96 | > print inst |
|
96 | > print inst | |
97 | > EOF |
|
97 | > EOF | |
98 | good heads: |
|
98 | good heads: | |
99 | 0: <baseset [0]> |
|
99 | 0: <baseset+ [0]> | |
100 | 1: <baseset [0]> |
|
100 | 1: <baseset+ [0]> | |
101 | -1: <baseset []> |
|
101 | -1: <baseset+ []> | |
102 | bad heads: |
|
102 | bad heads: | |
103 | 2: head out of range |
|
103 | 2: head out of range | |
104 | 10000: head out of range |
|
104 | 10000: head out of range | |
@@ -106,14 +106,14 b' Test SEGV caused by bad revision passed ' | |||||
106 | -10000: head out of range |
|
106 | -10000: head out of range | |
107 | None: an integer is required |
|
107 | None: an integer is required | |
108 | good roots: |
|
108 | good roots: | |
109 | 0: <baseset [0]> |
|
109 | 0: <baseset+ [0]> | |
110 | 1: <baseset [1]> |
|
110 | 1: <baseset+ [1]> | |
111 | -1: <baseset [-1]> |
|
111 | -1: <baseset+ [-1]> | |
112 | out-of-range roots are ignored: |
|
112 | out-of-range roots are ignored: | |
113 | 2: <baseset []> |
|
113 | 2: <baseset+ []> | |
114 | 10000: <baseset []> |
|
114 | 10000: <baseset+ []> | |
115 | -2: <baseset []> |
|
115 | -2: <baseset+ []> | |
116 | -10000: <baseset []> |
|
116 | -10000: <baseset+ []> | |
117 | bad roots: |
|
117 | bad roots: | |
118 | None: an integer is required |
|
118 | None: an integer is required | |
119 |
|
119 |
@@ -141,7 +141,7 b' trivial' | |||||
141 | ('symbol', '3') |
|
141 | ('symbol', '3') | |
142 | ('symbol', '6')) |
|
142 | ('symbol', '6')) | |
143 | * set: |
|
143 | * set: | |
144 | <baseset [3, 5, 6]> |
|
144 | <baseset+ [3, 5, 6]> | |
145 | 3 |
|
145 | 3 | |
146 | 5 |
|
146 | 5 | |
147 | 6 |
|
147 | 6 | |
@@ -991,7 +991,7 b' test that `or` operation skips duplicate' | |||||
991 | ('symbol', '4'))) |
|
991 | ('symbol', '4'))) | |
992 | * set: |
|
992 | * set: | |
993 | <addset |
|
993 | <addset | |
994 |
<baseset [ |
|
994 | <baseset- [1, 3, 5]>, | |
995 | <generatorset+>> |
|
995 | <generatorset+>> | |
996 | 5 |
|
996 | 5 | |
997 | 3 |
|
997 | 3 | |
@@ -1014,7 +1014,7 b' test that `or` operation skips duplicate' | |||||
1014 | * set: |
|
1014 | * set: | |
1015 | <addset+ |
|
1015 | <addset+ | |
1016 | <generatorset+>, |
|
1016 | <generatorset+>, | |
1017 |
<baseset [ |
|
1017 | <baseset- [1, 3, 5]>> | |
1018 | 0 |
|
1018 | 0 | |
1019 | 1 |
|
1019 | 1 | |
1020 | 2 |
|
1020 | 2 |
General Comments 0
You need to be logged in to leave comments.
Login now