Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/context.py @ 33755:8413cbeae275
context: rename bumped into phasedivergent
Rename bumped context method into phasedivergent and add a deprecation warning
on bumped.
Only update all callers to keep the patch straightforward.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D241
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Wed, 02 Aug 2017 19:09:00 +0200 |
| parents | 8b2d7684407b |
| children | 52c5ff856b49 |
comparison
equal
deleted
inserted
replaced
| 33754:8b2d7684407b | 33755:8413cbeae275 |
|---|---|
| 212 def orphan(self): | 212 def orphan(self): |
| 213 """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""" |
| 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. |
| 220 """ | 226 """ |
| 221 return self.rev() in obsmod.getrevs(self._repo, 'bumped') | 227 return self.rev() in obsmod.getrevs(self._repo, 'bumped') |
| 233 """ | 239 """ |
| 234 return self.rev() in obsmod.getrevs(self._repo, 'divergent') | 240 return self.rev() in obsmod.getrevs(self._repo, 'divergent') |
| 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.bumped() or self.contentdivergent() | 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 |
| 242 about different return values. | 248 about different return values. |
| 243 """ | 249 """ |
| 246 self._repo.ui.deprecwarn(msg, '4.4') | 252 self._repo.ui.deprecwarn(msg, '4.4') |
| 247 | 253 |
| 248 troubles = [] | 254 troubles = [] |
| 249 if self.orphan(): | 255 if self.orphan(): |
| 250 troubles.append('orphan') | 256 troubles.append('orphan') |
| 251 if self.bumped(): | 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') |
| 255 return troubles | 261 return troubles |
| 256 | 262 |
| 263 - content-divergent. | 269 - content-divergent. |
| 264 """ | 270 """ |
| 265 instabilities = [] | 271 instabilities = [] |
| 266 if self.orphan(): | 272 if self.orphan(): |
| 267 instabilities.append('orphan') | 273 instabilities.append('orphan') |
| 268 if self.bumped(): | 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') |
| 272 return instabilities | 278 return instabilities |
| 273 | 279 |