# HG changeset patch # User Boris Feld # Date 1501767114 -7200 # Node ID db6b666ce1e6c6fd26f6fb07c00fe0e3b18a081d # Parent 40739aef97f72a1e0aad1b727cefb942c268d5aa label: rename log.trouble into log.instability The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D259 diff -r 40739aef97f7 -r db6b666ce1e6 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Aug 03 15:30:41 2017 +0200 +++ b/mercurial/cmdutil.py Thu Aug 03 15:31:54 2017 +0200 @@ -1687,7 +1687,7 @@ # i18n: column positioning for "hg log" instabilities = ctx.instabilities() self.ui.write(_("instability: %s\n") % ', '.join(instabilities), - label='log.trouble') + label='log.instability') self._exthook(ctx) diff -r 40739aef97f7 -r db6b666ce1e6 mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default Thu Aug 03 15:30:41 2017 +0200 +++ b/mercurial/templates/map-cmdline.default Thu Aug 03 15:31:54 2017 +0200 @@ -68,7 +68,7 @@ ldate = '{label("log.date", "date: {date|date}")}\n' -ltroubles = '{if(instabilities, "{label('log.trouble', +ltroubles = '{if(instabilities, "{label('log.instability', 'instability: {join(instabilities, ", ")}')}\n")}' extra = '{label("ui.debug log.extra", diff -r 40739aef97f7 -r db6b666ce1e6 tests/test-obsolete.t --- a/tests/test-obsolete.t Thu Aug 03 15:30:41 2017 +0200 +++ b/tests/test-obsolete.t Thu Aug 03 15:31:54 2017 +0200 @@ -951,7 +951,7 @@ [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] [log.user|user: test] [log.date|date: Thu Jan 01 00:00:00 1970 +0000] - [log.trouble|instability: orphan, phase-divergent] + [log.instability|instability: orphan, phase-divergent] [log.summary|summary: add babar] @@ -959,7 +959,7 @@ [log.changeset changeset.draft changeset.unstable instability.orphaninstability.phase-divergent|changeset: 7:50c51b361e60] [log.user|user: test] [log.date|date: Thu Jan 01 00:00:00 1970 +0000] - [log.trouble|instability: orphan, phase-divergent] + [log.instability|instability: orphan, phase-divergent] [log.summary|summary: add babar]