Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 33688:2194a8723138
evolution: rename divergent to content-divergent
Rename divergent to content-divergent in all external user-facing output. Only
update user-facing output for the moment, variables names, templates keyword
and potentially configuration would be done in later series.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D215
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 01 Aug 2017 17:58:20 +0200 |
| parents | 03039ff3082b |
| children | 9c27a2891b75 |
comparison
equal
deleted
inserted
replaced
| 33687:6294654453ee | 33688:2194a8723138 |
|---|---|
| 229 """return the list of troubles affecting this changesets. | 229 """return the list of troubles affecting this changesets. |
| 230 | 230 |
| 231 Troubles are returned as strings. possible values are: | 231 Troubles are returned as strings. possible values are: |
| 232 - orphan, | 232 - orphan, |
| 233 - bumped, | 233 - bumped, |
| 234 - divergent. | 234 - content-divergent. |
| 235 """ | 235 """ |
| 236 troubles = [] | 236 troubles = [] |
| 237 if self.unstable(): | 237 if self.unstable(): |
| 238 troubles.append('orphan') | 238 troubles.append('orphan') |
| 239 if self.bumped(): | 239 if self.bumped(): |
| 240 troubles.append('bumped') | 240 troubles.append('bumped') |
| 241 if self.divergent(): | 241 if self.divergent(): |
| 242 troubles.append('divergent') | 242 troubles.append('content-divergent') |
| 243 return troubles | 243 return troubles |
| 244 | 244 |
| 245 def parents(self): | 245 def parents(self): |
| 246 """return contexts for each parent changeset""" | 246 """return contexts for each parent changeset""" |
| 247 return self._parents | 247 return self._parents |