Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 33776:ed99d3afef88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
33775:f078d7358e90 33776:ed99d3afef88
4990 4990
4991 if draft or secret: 4991 if draft or secret:
4992 ui.status(_('phases: %s\n') % ', '.join(t)) 4992 ui.status(_('phases: %s\n') % ', '.join(t))
4993 4993
4994 if obsolete.isenabled(repo, obsolete.createmarkersopt): 4994 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4995 for trouble in ("orphan", "contentdivergent", "bumped"): 4995 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
4996 numtrouble = len(repo.revs(trouble + "()")) 4996 numtrouble = len(repo.revs(trouble + "()"))
4997 # We write all the possibilities to ease translation 4997 # We write all the possibilities to ease translation
4998 troublemsg = { 4998 troublemsg = {
4999 "orphan": _("orphan: %d changesets"), 4999 "orphan": _("orphan: %d changesets"),
5000 "contentdivergent": _("content-divergent: %d changesets"), 5000 "contentdivergent": _("content-divergent: %d changesets"),
5001 "bumped": _("phase-divergent: %d changesets"), 5001 "phasedivergent": _("phase-divergent: %d changesets"),
5002 } 5002 }
5003 if numtrouble > 0: 5003 if numtrouble > 0:
5004 ui.status(troublemsg[trouble] % numtrouble + "\n") 5004 ui.status(troublemsg[trouble] % numtrouble + "\n")
5005 5005
5006 cmdutil.summaryhooks(ui, repo) 5006 cmdutil.summaryhooks(ui, repo)