Mercurial > hg-stable
changeset 34901:ec765a71bd65
obsfate: rename obsfate into obsolete in default mapfile
Like the previous patch, replace obsfate by obsolete in default mapfile.
Differential Revision: https://phab.mercurial-scm.org/D1190
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 19 Oct 2017 12:33:53 +0200 |
| parents | 3a3adbcbd3a0 |
| children | cc977ec0b8b9 |
| files | mercurial/templates/map-cmdline.default tests/test-obsmarker-template.t tests/test-obsolete.t |
| diffstat | 3 files changed, 34 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/map-cmdline.default Thu Oct 19 12:32:42 2017 +0200 +++ b/mercurial/templates/map-cmdline.default Thu Oct 19 12:33:53 2017 +0200 @@ -78,7 +78,7 @@ # Obsfate templates, it would be removed once we introduce the obsfate # template fragment -lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsfate: {fate}\n"}')}")}' +lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsolete: {fate}\n"}')}")}' [templatealias] labelcset(expr) = label(separate(" ",
--- a/tests/test-obsmarker-template.t Thu Oct 19 12:32:42 2017 +0200 +++ b/tests/test-obsmarker-template.t Thu Oct 19 12:33:53 2017 +0200 @@ -137,7 +137,7 @@ | @ 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 @@ -297,13 +297,13 @@ |/ 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 @@ -326,7 +326,7 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) + | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | files: A0 | description: | A1 @@ -335,7 +335,7 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) + | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | files: A0 | description: | A0 @@ -540,7 +540,7 @@ | 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 @@ -763,13 +763,13 @@ | 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 @@ -1035,7 +1035,7 @@ |/ 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 | | @ changeset: 2:fdf9bde5129a @@ -1048,8 +1048,8 @@ | 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 @@ -1341,19 +1341,19 @@ | | 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 @@ -1550,7 +1550,7 @@ | x 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 @@ -1741,14 +1741,14 @@ | x changeset: 2:0dec01379d3b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten as 3:f897c6137566 - | | obsfate: rewritten as 1:471f378eab4c + | | obsolete: rewritten as 3:f897c6137566 + | | obsolete: rewritten as 1:471f378eab4c | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten as 2:0dec01379d3b + | obsolete: rewritten as 2:0dec01379d3b | summary: A0 | @ changeset: 0:ea207398892e @@ -2212,14 +2212,14 @@ | x changeset: 7:ba2ed02b0c9a | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten using rebase as 10:eceed8f98ffc + | | obsolete: rewritten using rebase as 10:eceed8f98ffc | | summary: Add A,B,C | | | 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 @@ -2232,7 +2232,7 @@ | @ changeset: 4:9bd10a0775e4 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a + | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | summary: Add A,B,C | o changeset: 3:f897c6137566 @@ -2244,14 +2244,14 @@ | x changeset: 2:0dec01379d3b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsfate: rewritten as 3:f897c6137566 - | | obsfate: rewritten as 1:471f378eab4c + | | obsolete: rewritten as 3:f897c6137566 + | | obsolete: rewritten as 1:471f378eab4c | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: rewritten as 2:0dec01379d3b + | obsolete: rewritten as 2:0dec01379d3b | summary: A0 | o changeset: 0:ea207398892e @@ -2373,21 +2373,21 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: pruned + | obsolete: pruned | summary: A2 | | x changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: pruned + | obsolete: pruned | summary: A1 | | @ 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 @@ -2523,7 +2523,7 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsfate: pruned + | obsolete: pruned | summary: A2 | o changeset: 2:617adc3a144c @@ -2535,7 +2535,7 @@ | 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
--- a/tests/test-obsolete.t Thu Oct 19 12:32:42 2017 +0200 +++ b/tests/test-obsolete.t Thu Oct 19 12:33:53 2017 +0200 @@ -950,7 +950,7 @@ parent: 3:6f9641995072 user: test date: Thu Jan 01 00:00:00 1970 +0000 - obsfate: pruned + obsolete: pruned summary: add obsolete_e @@ -986,7 +986,7 @@ [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]