D258: label: rename trouble.X into instability.X
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG40739aef97f7: label: rename trouble.X into instability.X
(authored by lothiraldan).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D258?vs=603=812
REVISION DETAIL
https://phab.mercurial-scm.org/D258
AFFECTED FILES
mercurial/cmdutil.py
mercurial/templatekw.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.unstable trouble.orphan
trouble.phase-divergent|changeset: 7:50c51b361e60]
+ [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 +]
[log.trouble|instability: orphan, phase-divergent]
[log.summary|summary: add babar]
$ hg log -T default -r 'phasedivergent()' --color=debug
- [log.changeset changeset.draft changeset.unstable
trouble.orphantrouble.phase-divergent|changeset: 7:50c51b361e60]
+ [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 +]
[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
@@ -28,8 +28,8 @@
% ' {name} ({source})'}\n"))}'
# General templates
-_trouble_label = 'trouble.{trouble}'
-_troubles_labels = '{if(instabilities, "changeset.unstable
{instabilities%_trouble_label}")}'
+_instability_label = 'instability.{instability}'
+_troubles_labels = '{if(instabilities, "changeset.unstable
{instabilities%_instability_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/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -783,7 +783,7 @@
(EXPERIMENTAL)
"""
args = pycompat.byteskwargs(args)
-return showlist('trouble', args['ctx'].instabilities(), args)
+return showlist('instability', args['ctx'].instabilities(), args)
# tell hggettext to extract docstrings from these functions:
i18nfunctions = keywords.values()
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1573,7 +1573,7 @@
if ctx.isunstable():
labels.append('changeset.unstable')
for instability in ctx.instabilities():
-labels.append('trouble.%s' % instability)
+labels.append('instability.%s' % instability)
return ' '.join(labels)
class changeset_printer(object):
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
D258: label: rename trouble.X into instability.X
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/D258
AFFECTED FILES
mercurial/cmdutil.py
mercurial/templatekw.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.unstable trouble.orphan
trouble.phase-divergent|changeset: 7:50c51b361e60]
+ [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 +]
[log.trouble|instability: orphan, phase-divergent]
[log.summary|summary: add babar]
$ hg log -T default -r 'phasedivergent()' --color=debug
- [log.changeset changeset.draft changeset.unstable
trouble.orphantrouble.phase-divergent|changeset: 7:50c51b361e60]
+ [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 +]
[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
@@ -28,8 +28,8 @@
% ' {name} ({source})'}\n"))}'
# General templates
-_trouble_label = 'trouble.{trouble}'
-_troubles_labels = '{if(instabilities, "changeset.unstable
{instabilities%_trouble_label}")}'
+_instability_label = 'instability.{instability}'
+_troubles_labels = '{if(instabilities, "changeset.unstable
{instabilities%_instability_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/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -783,7 +783,7 @@
(EXPERIMENTAL)
"""
args = pycompat.byteskwargs(args)
-return showlist('trouble', args['ctx'].instabilities(), args)
+return showlist('instability', args['ctx'].instabilities(), args)
# tell hggettext to extract docstrings from these functions:
i18nfunctions = keywords.values()
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1467,7 +1467,7 @@
if ctx.isunstable():
labels.append('changeset.unstable')
for instability in ctx.instabilities():
-labels.append('trouble.%s' % instability)
+labels.append('instability.%s' % instability)
return ' '.join(labels)
class changeset_printer(object):
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
