Show More
@@ -214,6 +214,12 b' class basectx(object):' | |||||
214 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') |
|
214 | return self.rev() in obsmod.getrevs(self._repo, 'unstable') | |
215 |
|
215 | |||
216 | def bumped(self): |
|
216 | def bumped(self): | |
|
217 | msg = ("'context.bumped' is deprecated, " | |||
|
218 | "use 'context.phasedivergent'") | |||
|
219 | self._repo.ui.deprecwarn(msg, '4.4') | |||
|
220 | return self.phasedivergent() | |||
|
221 | ||||
|
222 | def phasedivergent(self): | |||
217 | """True if the changeset try to be a successor of a public changeset |
|
223 | """True if the changeset try to be a successor of a public changeset | |
218 |
|
224 | |||
219 | Only non-public and non-obsolete changesets may be bumped. |
|
225 | Only non-public and non-obsolete changesets may be bumped. | |
@@ -235,7 +241,7 b' class basectx(object):' | |||||
235 |
|
241 | |||
236 | def troubled(self): |
|
242 | def troubled(self): | |
237 | """True if the changeset is either unstable, bumped or divergent""" |
|
243 | """True if the changeset is either unstable, bumped or divergent""" | |
238 |
return self.orphan() or self. |
|
244 | return self.orphan() or self.phasedivergent() or self.contentdivergent() | |
239 |
|
245 | |||
240 | def troubles(self): |
|
246 | def troubles(self): | |
241 | """Keep the old version around in order to avoid breaking extensions |
|
247 | """Keep the old version around in order to avoid breaking extensions | |
@@ -248,7 +254,7 b' class basectx(object):' | |||||
248 | troubles = [] |
|
254 | troubles = [] | |
249 | if self.orphan(): |
|
255 | if self.orphan(): | |
250 | troubles.append('orphan') |
|
256 | troubles.append('orphan') | |
251 |
if self. |
|
257 | if self.phasedivergent(): | |
252 | troubles.append('bumped') |
|
258 | troubles.append('bumped') | |
253 | if self.contentdivergent(): |
|
259 | if self.contentdivergent(): | |
254 | troubles.append('divergent') |
|
260 | troubles.append('divergent') | |
@@ -265,7 +271,7 b' class basectx(object):' | |||||
265 | instabilities = [] |
|
271 | instabilities = [] | |
266 | if self.orphan(): |
|
272 | if self.orphan(): | |
267 | instabilities.append('orphan') |
|
273 | instabilities.append('orphan') | |
268 |
if self. |
|
274 | if self.phasedivergent(): | |
269 | instabilities.append('phase-divergent') |
|
275 | instabilities.append('phase-divergent') | |
270 | if self.contentdivergent(): |
|
276 | if self.contentdivergent(): | |
271 | instabilities.append('content-divergent') |
|
277 | instabilities.append('content-divergent') |
General Comments 0
You need to be logged in to leave comments.
Login now