--- a/tests/test-evolve-templates.t Thu Nov 28 11:41:17 2019 +0700
+++ b/tests/test-evolve-templates.t Thu Dec 26 22:32:44 2019 +0700
@@ -1,4 +1,4 @@
-This test file test the various templates for precursors and successors.
+This test file test the various templates for predecessors and successors.
Global setup
============
@@ -13,8 +13,8 @@
> evolve =
> [alias]
> tlog = log -G -T '{node|short}\
- > {if(precursors, "\n Precursors: {precursors}")}\
- > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
+ > {if(predecessors, "\n Predecessors: {predecessors}")}\
+ > {if(predecessors, "\n semi-colon: {join(predecessors, "; ")}")}\
> {if(successors, "\n Successors: {successors}")}\
> {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
> {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n'
@@ -69,7 +69,7 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: d004c8f274b9)
-Precursors template should show current revision as it is the working copy
+Predecessors template should show current revision as it is the working copy
$ hg olog tip
o d004c8f274b9 (3) A2
|
@@ -81,7 +81,7 @@
$ hg tlog
o d004c8f274b9
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Successors: 3:d004c8f274b9
@@ -139,7 +139,7 @@
(check json)
- $ hg log -GT '{precursors|json}\n'
+ $ hg log -GT '{predecessors|json}\n'
o ["471f378eab4c5e25f6c77f785b27c936efb22874"]
|
| @ []
@@ -162,10 +162,10 @@
working directory parent is obsolete! (a468dc9b3633)
(use 'hg evolve' to update to its successor: d004c8f274b9)
-Precursors template should show current revision as it is the working copy
+Predecessors template should show current revision as it is the working copy
$ hg tlog
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
+ | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633
| @ a468dc9b3633
|/ Successors: 3:d004c8f274b9
@@ -174,14 +174,14 @@
|
o ea207398892e
-Precursors template should show the precursor as we force its display with
+Predecessors template should show the precursor as we force its display with
--hidden
$ hg tlog --hidden
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
+ | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633
| @ a468dc9b3633
- |/ Precursors: 1:471f378eab4c
+ |/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| Successors: 3:d004c8f274b9
| semi-colon: 3:d004c8f274b9
@@ -211,10 +211,10 @@
$ hg tlog --hidden
@ d004c8f274b9
- | Precursors: 2:a468dc9b3633
+ | Predecessors: 2:a468dc9b3633
| semi-colon: 2:a468dc9b3633
| x a468dc9b3633
- |/ Precursors: 1:471f378eab4c
+ |/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| Successors: 3:d004c8f274b9
| semi-colon: 3:d004c8f274b9
@@ -343,13 +343,13 @@
working directory parent is obsolete! (471597cad322)
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
-Precursors template should show current revision as it is the working copy
+Predecessors template should show current revision as it is the working copy
$ hg tlog
o f257fde29c7a
- | Precursors: 1:471597cad322
+ | Predecessors: 1:471597cad322
| semi-colon: 1:471597cad322
o 337fec4d2edc
- | Precursors: 1:471597cad322
+ | Predecessors: 1:471597cad322
| semi-colon: 1:471597cad322
| @ 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
@@ -372,7 +372,7 @@
$ hg up f257fde29c7a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-Precursors template should not show a precursor as it's not displayed in the
+Predecessors template should not show a precursor as it's not displayed in the
log
$ hg tlog
@ f257fde29c7a
@@ -381,14 +381,14 @@
|
o ea207398892e
-Precursors template should show the precursor as we force its display with
+Predecessors template should show the precursor as we force its display with
--hidden
$ hg tlog --hidden
@ f257fde29c7a
- | Precursors: 1:471597cad322
+ | Predecessors: 1:471597cad322
| semi-colon: 1:471597cad322
o 337fec4d2edc
- | Precursors: 1:471597cad322
+ | Predecessors: 1:471597cad322
| semi-colon: 1:471597cad322
| x 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
@@ -474,10 +474,10 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
-Precursors template should show current revision as it is the working copy
+Predecessors template should show current revision as it is the working copy
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Successors: 3:eb5a0daa2192
@@ -501,11 +501,11 @@
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
-Precursors template should show both precursors as they should be both
+Predecessors template should show both predecessors as they should be both
displayed
$ hg tlog
o eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
+ | Predecessors: 2:0dec01379d3b 1:471f378eab4c
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
| @ 0dec01379d3b
| | Successors: 3:eb5a0daa2192
@@ -534,18 +534,18 @@
$ hg up 'desc(C0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-Precursors template should not show precursors as it's not displayed in the
+Predecessors template should not show predecessors as it's not displayed in the
log
$ hg tlog
@ eb5a0daa2192
|
o ea207398892e
-Precursors template should show both precursors as we force its display with
+Predecessors template should show both predecessors as we force its display with
--hidden
$ hg tlog --hidden
@ eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
+ | Predecessors: 2:0dec01379d3b 1:471f378eab4c
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
| x 0dec01379d3b
| | Successors: 3:eb5a0daa2192
@@ -649,13 +649,13 @@
working directory parent is obsolete! (471f378eab4c)
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
-Precursors template should show current revision as it is the working copy
+Predecessors template should show current revision as it is the working copy
$ hg tlog
* 019fadeab383
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| * fdf9bde5129a
- |/ Precursors: 1:471f378eab4c
+ |/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
@@ -678,7 +678,7 @@
$ hg up 'desc(A1)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-Precursors template should not show precursors as it's not displayed in the
+Predecessors template should not show predecessors as it's not displayed in the
log
$ hg tlog
* 019fadeab383
@@ -695,20 +695,20 @@
|/
o ea207398892e
-Precursors template should a precursor as we force its display with --hidden
+Predecessors template should a precursor as we force its display with --hidden
$ hg tlog --hidden
* 019fadeab383
- | Precursors: 3:65b757b745b9
+ | Predecessors: 3:65b757b745b9
| semi-colon: 3:65b757b745b9
| x 65b757b745b9
- |/ Precursors: 1:471f378eab4c
+ |/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| Successors: 4:019fadeab383
| semi-colon: 4:019fadeab383
| Fate: reworded using amend as 4:019fadeab383
|
| @ fdf9bde5129a
- |/ Precursors: 1:471f378eab4c
+ |/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| x 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
@@ -814,7 +814,7 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Successors: 4:eb5a0daa2192
@@ -839,7 +839,7 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 2:0dec01379d3b 1:471f378eab4c
+ | Predecessors: 2:0dec01379d3b 1:471f378eab4c
| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
| @ 0dec01379d3b
| | Successors: 4:eb5a0daa2192
@@ -873,7 +873,7 @@
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
o eb5a0daa2192
- | Precursors: 1:471f378eab4c 3:b7ea6d14e664
+ | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
| @ b7ea6d14e664
| | Successors: 4:eb5a0daa2192
@@ -908,10 +908,10 @@
$ hg tlog --hidden
@ eb5a0daa2192
- | Precursors: 1:471f378eab4c 3:b7ea6d14e664
+ | Predecessors: 1:471f378eab4c 3:b7ea6d14e664
| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
| x b7ea6d14e664
- | | Precursors: 2:0dec01379d3b
+ | | Predecessors: 2:0dec01379d3b
| | semi-colon: 2:0dec01379d3b
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
@@ -1037,7 +1037,7 @@
$ hg tlog
o 7a230b46bf61
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Successors: 2:7a230b46bf61
@@ -1068,7 +1068,7 @@
$ hg tlog --hidden
@ 7a230b46bf61
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| x 471f378eab4c
|/ Successors: 2:7a230b46bf61
@@ -1135,10 +1135,10 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
o f897c6137566
- | Precursors: 2:0dec01379d3b
+ | Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| @ 0dec01379d3b
- | | Precursors: 1:471f378eab4c
+ | | Predecessors: 1:471f378eab4c
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
@@ -1146,7 +1146,7 @@
| | Fate: rewritten as 1:471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
+ |/ Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
@@ -1171,7 +1171,7 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
o f897c6137566
- | Precursors: 1:471f378eab4c
+ | Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
|/ Fate: pruned
@@ -1201,10 +1201,10 @@
$ hg tlog --hidden
o f897c6137566
- | Precursors: 2:0dec01379d3b
+ | Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| x 0dec01379d3b
- | | Precursors: 1:471f378eab4c
+ | | Predecessors: 1:471f378eab4c
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
@@ -1212,7 +1212,7 @@
| | Fate: rewritten as 1:471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
+ |/ Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
@@ -1388,10 +1388,10 @@
$ hg tlog
@ 0b997eb7ceee
- | Precursors: 6:4a004186e638
+ | Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| * b18bc8331526
- |/ Precursors: 6:4a004186e638
+ |/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| * ba2ed02b0c9a
| |
@@ -1425,16 +1425,16 @@
$ hg tlog --hidden
@ 0b997eb7ceee
- | Precursors: 6:4a004186e638
+ | Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| * b18bc8331526
- |/ Precursors: 6:4a004186e638
+ |/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| * ba2ed02b0c9a
- | | Precursors: 4:9bd10a0775e4
+ | | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
| x 4a004186e638
- |/ Precursors: 4:9bd10a0775e4
+ |/ Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| Successors: 8:b18bc8331526; 9:0b997eb7ceee
| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
@@ -1442,7 +1442,7 @@
| Fate: reworded using amend as 9:0b997eb7ceee
|
* dd800401bd8c
- | Precursors: 4:9bd10a0775e4
+ | Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| x 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
@@ -1450,10 +1450,10 @@
| Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
|
o f897c6137566
- | Precursors: 2:0dec01379d3b
+ | Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| x 0dec01379d3b
- | | Precursors: 1:471f378eab4c
+ | | Predecessors: 1:471f378eab4c
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
@@ -1461,7 +1461,7 @@
| | Fate: rewritten as 1:471f378eab4c
| |
| x 471f378eab4c
- |/ Precursors: 2:0dec01379d3b
+ |/ Predecessors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
@@ -1504,16 +1504,16 @@
rebasing 7:ba2ed02b0c9a "Add A,B,C"
$ hg tlog
* eceed8f98ffc
- | Precursors: 4:9bd10a0775e4
+ | Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| * 0b997eb7ceee
- | | Precursors: 4:9bd10a0775e4
+ | | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
* | b18bc8331526
- |/ Precursors: 4:9bd10a0775e4
+ |/ Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
* dd800401bd8c
- | Precursors: 4:9bd10a0775e4
+ | Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| @ 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc