Mercurial > hg
comparison mercurial/revset.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 |
|---|---|
| 730 """ | 730 """ |
| 731 Final successors of changesets with an alternative set of final successors. | 731 Final successors of changesets with an alternative set of final successors. |
| 732 """ | 732 """ |
| 733 # i18n: "contentdivergent" is a keyword | 733 # i18n: "contentdivergent" is a keyword |
| 734 getargs(x, 0, 0, _("contentdivergent takes no arguments")) | 734 getargs(x, 0, 0, _("contentdivergent takes no arguments")) |
| 735 divergent = obsmod.getrevs(repo, 'divergent') | 735 contentdivergent = obsmod.getrevs(repo, 'contentdivergent') |
| 736 return subset & divergent | 736 return subset & contentdivergent |
| 737 | 737 |
| 738 @predicate('extinct()', safe=True) | 738 @predicate('extinct()', safe=True) |
| 739 def extinct(repo, subset, x): | 739 def extinct(repo, subset, x): |
| 740 """Obsolete changesets with obsolete descendants only. | 740 """Obsolete changesets with obsolete descendants only. |
| 741 """ | 741 """ |