Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 33774:9dcc3529e002
revset: rename unstable into orphan
Don't touch unstable 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/D250
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 03 Aug 2017 13:48:39 +0200 |
| parents | d434a7f0685c |
| children | f078d7358e90 |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Aug 04 18:41:16 2017 +0200 +++ b/mercurial/commands.py Thu Aug 03 13:48:39 2017 +0200 @@ -4992,11 +4992,11 @@ ui.status(_('phases: %s\n') % ', '.join(t)) if obsolete.isenabled(repo, obsolete.createmarkersopt): - for trouble in ("unstable", "divergent", "bumped"): + for trouble in ("orphan", "divergent", "bumped"): numtrouble = len(repo.revs(trouble + "()")) # We write all the possibilities to ease translation troublemsg = { - "unstable": _("orphan: %d changesets"), + "orphan": _("orphan: %d changesets"), "divergent": _("content-divergent: %d changesets"), "bumped": _("phase-divergent: %d changesets"), }