Mercurial > public > mercurial-scm > hg
comparison mercurial/revset.py @ 33776:ed99d3afef88
revset: rename bumped into phasedivergent
Don't touch bumped 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/D252
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 03 Aug 2017 14:08:39 +0200 |
| parents | f078d7358e90 |
| children | d4b7496f7d0b |
comparison
equal
deleted
inserted
replaced
| 33775:f078d7358e90 | 33776:ed99d3afef88 |
|---|---|
| 457 return subset.filter(lambda r: c(r) or getbranch(r) in b, | 457 return subset.filter(lambda r: c(r) or getbranch(r) in b, |
| 458 condrepr=lambda: '<branch %r>' % sorted(b)) | 458 condrepr=lambda: '<branch %r>' % sorted(b)) |
| 459 | 459 |
| 460 @predicate('bumped()', safe=True) | 460 @predicate('bumped()', safe=True) |
| 461 def bumped(repo, subset, x): | 461 def bumped(repo, subset, x): |
| 462 msg = ("'bumped()' is deprecated, " | |
| 463 "use 'phasedivergent()'") | |
| 464 repo.ui.deprecwarn(msg, '4.4') | |
| 465 | |
| 466 return phasedivergent(repo, subset, x) | |
| 467 | |
| 468 @predicate('phasedivergent()', safe=True) | |
| 469 def phasedivergent(repo, subset, x): | |
| 462 """Mutable changesets marked as successors of public changesets. | 470 """Mutable changesets marked as successors of public changesets. |
| 463 | 471 |
| 464 Only non-public and non-obsolete changesets can be `bumped`. | 472 Only non-public and non-obsolete changesets can be `phasedivergent`. |
| 465 """ | 473 """ |
| 466 # i18n: "bumped" is a keyword | 474 # i18n: "phasedivergent" is a keyword |
| 467 getargs(x, 0, 0, _("bumped takes no arguments")) | 475 getargs(x, 0, 0, _("phasedivergent takes no arguments")) |
| 468 bumped = obsmod.getrevs(repo, 'bumped') | 476 bumped = obsmod.getrevs(repo, 'bumped') |
| 469 return subset & bumped | 477 return subset & bumped |
| 470 | 478 |
| 471 @predicate('bundle()', safe=True) | 479 @predicate('bundle()', safe=True) |
| 472 def bundle(repo, subset, x): | 480 def bundle(repo, subset, x): |