Mercurial > public > mercurial-scm > hg
diff mercurial/commands.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 | f6dc30b83432 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Aug 03 14:01:51 2017 +0200 +++ b/mercurial/commands.py Thu Aug 03 14:08:39 2017 +0200 @@ -4992,13 +4992,13 @@ ui.status(_('phases: %s\n') % ', '.join(t)) if obsolete.isenabled(repo, obsolete.createmarkersopt): - for trouble in ("orphan", "contentdivergent", "bumped"): + for trouble in ("orphan", "contentdivergent", "phasedivergent"): numtrouble = len(repo.revs(trouble + "()")) # We write all the possibilities to ease translation troublemsg = { "orphan": _("orphan: %d changesets"), "contentdivergent": _("content-divergent: %d changesets"), - "bumped": _("phase-divergent: %d changesets"), + "phasedivergent": _("phase-divergent: %d changesets"), } if numtrouble > 0: ui.status(troublemsg[trouble] % numtrouble + "\n")