Mercurial > public > mercurial-scm > hg

comparison mercurial/revset.py @ 33775:f078d7358e90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: remane divergent into contentdivergent Don't touch divergent volatile set name, only the revset name. The volatile set name will be updated in a later patch. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D251
author Boris Feld <boris.feld@octobus.net>
date Thu, 03 Aug 2017 14:01:51 +0200
parents 9dcc3529e002
children ed99d3afef88
comparison
equal deleted inserted replaced
33774:9dcc3529e002 33775:f078d7358e90
709 return subset.filter(dests.__contains__, 709 return subset.filter(dests.__contains__,
710 condrepr=lambda: '<destination %r>' % sorted(dests)) 710 condrepr=lambda: '<destination %r>' % sorted(dests))
711 711
712 @predicate('divergent()', safe=True) 712 @predicate('divergent()', safe=True)
713 def divergent(repo, subset, x): 713 def divergent(repo, subset, x):
714 msg = ("'divergent()' is deprecated, "
715 "use 'contentdivergent()'")
716 repo.ui.deprecwarn(msg, '4.4')
717
718 return contentdivergent(repo, subset, x)
719
720 @predicate('contentdivergent()', safe=True)
721 def contentdivergent(repo, subset, x):
714 """ 722 """
715 Final successors of changesets with an alternative set of final successors. 723 Final successors of changesets with an alternative set of final successors.
716 """ 724 """
717 # i18n: "divergent" is a keyword 725 # i18n: "contentdivergent" is a keyword
718 getargs(x, 0, 0, _("divergent takes no arguments")) 726 getargs(x, 0, 0, _("contentdivergent takes no arguments"))
719 divergent = obsmod.getrevs(repo, 'divergent') 727 divergent = obsmod.getrevs(repo, 'divergent')
720 return subset & divergent 728 return subset & divergent
721 729
722 @predicate('extinct()', safe=True) 730 @predicate('extinct()', safe=True)
723 def extinct(repo, subset, x): 731 def extinct(repo, subset, x):