Show More
@@ -204,6 +204,12 b' class basectx(object):' | |||||
204 | return self.rev() in obsmod.getrevs(self._repo, 'extinct') |
|
204 | return self.rev() in obsmod.getrevs(self._repo, 'extinct') | |
205 |
|
205 | |||
206 | def unstable(self): |
|
206 | def unstable(self): | |
|
207 | msg = ("'context.unstable' is deprecated, " | |||
|
208 | "use 'context.orphan'") | |||
|
209 | self._repo.ui.deprecwarn(msg, '4.4') | |||
|
210 | return self.orphan() | |||
|
211 | ||||
|
212 | def orphan(self): | |||
207 | """True if the changeset is not obsolete but it's ancestor are""" |
|
213 | """True if the changeset is not obsolete but it's ancestor are""" | |
208 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') |
|
214 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') | |
209 |
|
215 | |||
@@ -223,7 +229,7 b' class basectx(object):' | |||||
223 |
|
229 | |||
224 | def troubled(self): |
|
230 | def troubled(self): | |
225 | """True if the changeset is either unstable, bumped or divergent""" |
|
231 | """True if the changeset is either unstable, bumped or divergent""" | |
226 |
return self. |
|
232 | return self.orphan() or self.bumped() or self.divergent() | |
227 |
|
233 | |||
228 | def troubles(self): |
|
234 | def troubles(self): | |
229 | """Keep the old version around in order to avoid breaking extensions |
|
235 | """Keep the old version around in order to avoid breaking extensions | |
@@ -234,7 +240,7 b' class basectx(object):' | |||||
234 | self._repo.ui.deprecwarn(msg, '4.4') |
|
240 | self._repo.ui.deprecwarn(msg, '4.4') | |
235 |
|
241 | |||
236 | troubles = [] |
|
242 | troubles = [] | |
237 |
if self. |
|
243 | if self.orphan(): | |
238 | troubles.append('orphan') |
|
244 | troubles.append('orphan') | |
239 | if self.bumped(): |
|
245 | if self.bumped(): | |
240 | troubles.append('bumped') |
|
246 | troubles.append('bumped') | |
@@ -251,7 +257,7 b' class basectx(object):' | |||||
251 | - content-divergent. |
|
257 | - content-divergent. | |
252 | """ |
|
258 | """ | |
253 | instabilities = [] |
|
259 | instabilities = [] | |
254 |
if self. |
|
260 | if self.orphan(): | |
255 | instabilities.append('orphan') |
|
261 | instabilities.append('orphan') | |
256 | if self.bumped(): |
|
262 | if self.bumped(): | |
257 | instabilities.append('phase-divergent') |
|
263 | instabilities.append('phase-divergent') |
General Comments 0
You need to be logged in to leave comments.
Login now