lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D257 AFFECTED FILES mercurial/cmdutil.py mercurial/templates/map-cmdline.default tests/test-obsolete.t CHANGE DETAILS diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -948,15 +948,15 @@ test the obsolete labels $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' - [log.changeset changeset.draft changeset.troubled trouble.orphan trouble.phase-divergent|changeset: 7:50c51b361e60] + [log.changeset changeset.draft changeset.unstable trouble.orphan trouble.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.summary|summary: add babar] $ hg log -T default -r 'phasedivergent()' --color=debug - [log.changeset changeset.draft changeset.troubled trouble.orphantrouble.phase-divergent|changeset: 7:50c51b361e60] + [log.changeset changeset.draft changeset.unstable trouble.orphantrouble.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] diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default +++ b/mercurial/templates/map-cmdline.default @@ -29,7 +29,7 @@ # General templates _trouble_label = 'trouble.{trouble}' -_troubles_labels = '{if(instabilities, "changeset.troubled {instabilities%_trouble_label}")}' +_troubles_labels = '{if(instabilities, "changeset.unstable {instabilities%_trouble_label}")}' _obsolete_label = '{if(obsolete, "changeset.obsolete")}' _cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{_obsolete_label}", "{_troubles_labels}")}' cset = '{label("{_cset_labels}", diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1465,7 +1465,7 @@ if ctx.obsolete(): labels.append('changeset.obsolete') if ctx.isunstable(): - labels.append('changeset.troubled') + labels.append('changeset.unstable') for instability in ctx.instabilities(): labels.append('trouble.%s' % instability) return ' '.join(labels) To: lothiraldan, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel