changeset 33783:db6b666ce1e6

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
author Boris Feld <boris.feld@octobus.net>
date Thu, 03 Aug 2017 15:31:54 +0200
parents 40739aef97f7
children 589fda7895da
files mercurial/cmdutil.py mercurial/templates/map-cmdline.default tests/test-obsolete.t
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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",
--- 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]