D213: evolution: rename trouble(s) to instability
lothiraldan updated this revision to Diff 578. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D213?vs=504&id=578 REVISION DETAIL https://phab.mercurial-scm.org/D213 AFFECTED FILES mercurial/cmdutil.py tests/test-commit-amend.t tests/test-obsmarker-template.t CHANGE DETAILS diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -442,14 +442,14 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -469,7 +469,7 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A3 | | x changeset: 3:65b757b745b9 @@ -482,7 +482,7 @@ |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -1086,20 +1086,20 @@ | parent: 5:dd800401bd8c | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add B only | | o changeset: 8:b18bc8331526 |/ parent: 5:dd800401bd8c |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: Add only B | | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | trouble: unstable, divergent + | | instability: unstable, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 @@ -,7 +,7 @@ | parent: 3:f897c6137566 | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add A,B,C | o changeset: 3:f897c6137566 diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -610,7 +610,7 @@ parent: 11:3334b7925910 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable + instability: unstable summary: babar diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1579,7 +1579,7 @@ if ctx.troubled(): # i18n: column positioning for "hg log" -self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()), +self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()), label='log.trouble') self._exthook(ctx) To: lothiraldan, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D213: evolution: rename trouble(s) to instability
This revision was automatically updated to reflect the committed changes. Closed by commit rHG6f4bc9688ca9: evolution: rename trouble(s) to instability (authored by lothiraldan). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D213?vs=496&id=504 REVISION DETAIL https://phab.mercurial-scm.org/D213 AFFECTED FILES mercurial/cmdutil.py tests/test-commit-amend.t tests/test-obsmarker-template.t CHANGE DETAILS diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -442,14 +442,14 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -469,7 +469,7 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A3 | | x changeset: 3:65b757b745b9 @@ -482,7 +482,7 @@ |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -1086,20 +1086,20 @@ | parent: 5:dd800401bd8c | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add B only | | o changeset: 8:b18bc8331526 |/ parent: 5:dd800401bd8c |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: Add only B | | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | trouble: unstable, divergent + | | instability: unstable, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 @@ -,7 +,7 @@ | parent: 3:f897c6137566 | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add A,B,C | o changeset: 3:f897c6137566 diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -610,7 +610,7 @@ parent: 11:3334b7925910 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable + instability: unstable summary: babar diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1579,7 +1579,7 @@ if ctx.troubled(): # i18n: column positioning for "hg log" -self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()), +self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()), label='log.trouble') self._exthook(ctx) To: lothiraldan, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D213: evolution: rename trouble(s) to instability
lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Rename trouble(s) to instability in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and potentially configuration would be done in later series. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D213 AFFECTED FILES mercurial/cmdutil.py tests/test-commit-amend.t tests/test-obsmarker-template.t CHANGE DETAILS diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t --- a/tests/test-obsmarker-template.t +++ b/tests/test-obsmarker-template.t @@ -442,14 +442,14 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -469,7 +469,7 @@ | parent: 0:ea207398892e | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: A3 | | x changeset: 3:65b757b745b9 @@ -482,7 +482,7 @@ |/ parent: 0:ea207398892e |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: A1 | | x changeset: 1:471f378eab4c @@ -1086,20 +1086,20 @@ | parent: 5:dd800401bd8c | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add B only | | o changeset: 8:b18bc8331526 |/ parent: 5:dd800401bd8c |user:test |date:Thu Jan 01 00:00:00 1970 + - |trouble: divergent + |instability: divergent |summary: Add only B | | o changeset: 7:ba2ed02b0c9a | | user:test | | date:Thu Jan 01 00:00:00 1970 + - | | trouble: unstable, divergent + | | instability: unstable, divergent | | summary: Add A,B,C | | | x changeset: 6:4a004186e638 @@ -,7 +,7 @@ | parent: 3:f897c6137566 | user:test | date:Thu Jan 01 00:00:00 1970 + - | trouble: divergent + | instability: divergent | summary: Add A,B,C | o changeset: 3:f897c6137566 diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -610,7 +610,7 @@ parent: 11:3334b7925910 user:test date:Thu Jan 01 00:00:00 1970 + - trouble: unstable + instability: unstable summary: babar diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1579,7 +1579,7 @@ if ctx.troubled(): # i18n: column positioning for "hg log" -self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()), +self.ui.write(_("instability: %s\n") % ', '.join(ctx.troubles()), label='log.trouble') self._exthook(ctx) 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