# HG changeset patch # User Boris Feld # Date 2017-10-19 10:32:42 # Node ID 3a3adbcbd3a0f8e8abb4673605c7285ab6df1f57 # Parent 1e2dc50da17b6c7c915f7efe4a1af3e5b52e297e obsfate: rename obsfate into obsolete in changeset_printer Yuja's comment on the original obsfate about how we would translate obsfate and the recent discussions about exposing users to new concepts and names lead have led me to think that 'obsfate' should be treated as internal jargon. End- users should not be aware of obsfate, so we replace 'obsfate' by 'obsolete' in changeset_printer. It will be easier to understand for end-users, easier to translate and closer to the original Evolve obsfate output. I'm aware it's extremely late in the cycle but I think it's an UX improvement for the end-users. Differential Revision: https://phab.mercurial-scm.org/D1189 diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1728,7 +1728,7 @@ class changeset_printer(object): if obsfate: for obsfateline in obsfate: # i18n: column positioning for "hg log" - self.ui.write(_("obsfate: %s\n") % obsfateline, + self.ui.write(_("obsolete: %s\n") % obsfateline, label='log.obsfate') def _exthook(self, ctx): diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t --- a/tests/test-commandserver.t +++ b/tests/test-commandserver.t @@ -535,7 +535,7 @@ changelog and manifest would have invali tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 - obsfate: pruned + obsolete: pruned summary: . changeset: 0:eff892de26ec 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 @@ -58,13 +58,13 @@ Test setup |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 + | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:a468dc9b3633 + | obsolete: rewritten using amend as 2:a468dc9b3633 | summary: A0 | o changeset: 0:ea207398892e @@ -117,7 +117,7 @@ Predecessors template should show curren | @ changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 + | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 | summary: A0 | o changeset: 0:ea207398892e @@ -401,7 +401,7 @@ Test templates with splitted commit | x changeset: 1:471597cad322 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a + | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a | summary: A0 | o changeset: 0:ea207398892e @@ -602,13 +602,13 @@ Simulate a fold | x changeset: 2:0dec01379d3b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten as 3:eb5a0daa2192 + | | obsolete: rewritten as 3:eb5a0daa2192 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten as 3:eb5a0daa2192 + | obsolete: rewritten as 3:eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -800,7 +800,7 @@ Test setup | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:fdf9bde5129a + | obsolete: rewritten using amend as 2:fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -830,8 +830,8 @@ Test setup | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:fdf9bde5129a - | obsfate: rewritten using amend as 3:65b757b745b9 + | obsolete: rewritten using amend as 2:fdf9bde5129a + | obsolete: rewritten using amend as 3:65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -853,7 +853,7 @@ Test setup |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 4:019fadeab383 + | obsolete: rewritten using amend as 4:019fadeab383 | summary: A2 | | o changeset: 2:fdf9bde5129a @@ -866,8 +866,8 @@ Test setup | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:fdf9bde5129a - | obsfate: rewritten using amend as 3:65b757b745b9 + | obsolete: rewritten using amend as 2:fdf9bde5129a + | obsolete: rewritten using amend as 3:65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -1081,7 +1081,7 @@ Test setup | x changeset: 2:0dec01379d3b |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 3:b7ea6d14e664 + | obsolete: rewritten using amend as 3:b7ea6d14e664 | summary: B0 | o changeset: 1:471f378eab4c @@ -1120,19 +1120,19 @@ Test setup | | parent: 1:471f378eab4c | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten as 4:eb5a0daa2192 + | | obsolete: rewritten as 4:eb5a0daa2192 | | summary: B1 | | | | x changeset: 2:0dec01379d3b | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten using amend as 3:b7ea6d14e664 + | | obsolete: rewritten using amend as 3:b7ea6d14e664 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten as 4:eb5a0daa2192 + | obsolete: rewritten as 4:eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -1403,13 +1403,13 @@ Test setup |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 3:7a230b46bf61 + | obsolete: rewritten using amend as 3:7a230b46bf61 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:fdf9bde5129a + | obsolete: rewritten using amend as 2:fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1440,7 +1440,7 @@ Test setup | @ changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:7a230b46bf61 + | obsolete: rewritten using amend as 2:7a230b46bf61 | summary: A0 | o changeset: 0:ea207398892e @@ -1893,8 +1893,8 @@ Diverge one of the splitted commit | x changeset: 6:4a004186e638 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 8:b18bc8331526 - | obsfate: rewritten using amend as 9:0b997eb7ceee + | obsolete: rewritten using amend as 8:b18bc8331526 + | obsolete: rewritten using amend as 9:0b997eb7ceee | summary: Add A,B,C | o changeset: 5:dd800401bd8c @@ -2441,7 +2441,7 @@ Test templates with splitted and pruned | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: pruned + | obsolete: pruned | summary: A2 | o changeset: 2:617adc3a144c @@ -2453,7 +2453,7 @@ Test templates with splitted and pruned | x changeset: 1:471597cad322 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e + | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e | summary: A0 | o changeset: 0:ea207398892e diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -977,7 +977,7 @@ test the obsolete labels [log.parent changeset.draft|parent: 3:6f9641995072] [log.user|user: test] [log.date|date: Thu Jan 01 00:00:00 1970 +0000] - [log.obsfate|obsfate: pruned] + [log.obsfate|obsolete: pruned] [log.summary|summary: add obsolete_e]