Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 33778:f3f06c260e9e
obsolete: rename divergent volatile set into contentdivergent volatile set
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D254
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 04 Aug 2017 19:36:27 +0200 |
| parents | d4b7496f7d0b |
| children | 9fa874fb34e1 |
comparison
equal
deleted
inserted
replaced
| 33777:d4b7496f7d0b | 33778:f3f06c260e9e |
|---|---|
| 235 def contentdivergent(self): | 235 def contentdivergent(self): |
| 236 """Is a successors of a changeset with multiple possible successors set | 236 """Is a successors of a changeset with multiple possible successors set |
| 237 | 237 |
| 238 Only non-public and non-obsolete changesets may be divergent. | 238 Only non-public and non-obsolete changesets may be divergent. |
| 239 """ | 239 """ |
| 240 return self.rev() in obsmod.getrevs(self._repo, 'divergent') | 240 return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent') |
| 241 | 241 |
| 242 def troubled(self): | 242 def troubled(self): |
| 243 msg = ("'context.troubled' is deprecated, " | 243 msg = ("'context.troubled' is deprecated, " |
| 244 "use 'context.isunstable'") | 244 "use 'context.isunstable'") |
| 245 self._repo.ui.deprecwarn(msg, '4.4') | 245 self._repo.ui.deprecwarn(msg, '4.4') |