Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 33695:03039ff3082b
evolution: rename unstable to orphan
Rename unstable to orphan in all external user-facing output. Only update
user-facing output for the moment, variables names, templates keyword and
potentially configuration would be done in later series.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D214
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 01 Aug 2017 17:53:48 +0200 |
parents | 4cd4344a53c4 |
children | 6294654453ee |
comparison
equal
deleted
inserted
replaced
33694:6f4bc9688ca9 | 33695:03039ff3082b |
---|---|
4939 if obsolete.isenabled(repo, obsolete.createmarkersopt): | 4939 if obsolete.isenabled(repo, obsolete.createmarkersopt): |
4940 for trouble in ("unstable", "divergent", "bumped"): | 4940 for trouble in ("unstable", "divergent", "bumped"): |
4941 numtrouble = len(repo.revs(trouble + "()")) | 4941 numtrouble = len(repo.revs(trouble + "()")) |
4942 # We write all the possibilities to ease translation | 4942 # We write all the possibilities to ease translation |
4943 troublemsg = { | 4943 troublemsg = { |
4944 "unstable": _("unstable: %d changesets"), | 4944 "unstable": _("orphan: %d changesets"), |
4945 "divergent": _("divergent: %d changesets"), | 4945 "divergent": _("divergent: %d changesets"), |
4946 "bumped": _("bumped: %d changesets"), | 4946 "bumped": _("bumped: %d changesets"), |
4947 } | 4947 } |
4948 if numtrouble > 0: | 4948 if numtrouble > 0: |
4949 ui.status(troublemsg[trouble] % numtrouble + "\n") | 4949 ui.status(troublemsg[trouble] % numtrouble + "\n") |