--- a/tests/test-obsmarker-template.t Tue Dec 26 23:40:49 2017 -0500
+++ b/tests/test-obsmarker-template.t Fri Dec 22 23:17:04 2017 +0800
@@ -820,7 +820,7 @@
| instability: content-divergent
| summary: A2
|
- | o changeset: 2:fdf9bde5129a
+ | * changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -856,7 +856,7 @@
| obsolete: rewritten using amend as 4:019fadeab383
| summary: A2
|
- | o changeset: 2:fdf9bde5129a
+ | * changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -884,12 +884,12 @@
Predecessors template should show current revision as it is the working copy
$ hg tlog
- o 019fadeab383
+ * 019fadeab383
| Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
- | o fdf9bde5129a
+ | * fdf9bde5129a
|/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
@@ -902,9 +902,9 @@
o ea207398892e
$ hg fatelog
- o 019fadeab383
+ * 019fadeab383
|
- | o fdf9bde5129a
+ | * fdf9bde5129a
|/
| @ 471f378eab4c
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
@@ -916,7 +916,7 @@
Predecessors template should not show predecessors as they are not displayed in
the log
$ hg tlog
- o 019fadeab383
+ * 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -924,7 +924,7 @@
$ hg fatelog
- o 019fadeab383
+ * 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -933,7 +933,7 @@
Predecessors template should the predecessors as we force their display with
--hidden
$ hg tlog --hidden
- o 019fadeab383
+ * 019fadeab383
| Predecessors: 3:65b757b745b9
| semi-colon: 3:65b757b745b9
| json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
@@ -960,7 +960,7 @@
$ hg fatelog --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
@@ -972,7 +972,7 @@
$ hg fatelogjson --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
@@ -987,7 +987,7 @@
-----------------------------------
$ hg fatelogkw --hidden -q
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383
@@ -999,7 +999,7 @@
o ea207398892e
$ hg fatelogkw --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383
@@ -1011,7 +1011,7 @@
o ea207398892e
$ hg fatelogkw --hidden -v
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000)
@@ -1023,7 +1023,7 @@
o ea207398892e
$ hg log -G -T "default" --hidden
- o changeset: 4:019fadeab383
+ * changeset: 4:019fadeab383
| tag: tip
| parent: 0:ea207398892e
| user: test
@@ -1877,14 +1877,14 @@
| instability: content-divergent
| summary: Add B only
|
- | o changeset: 8:b18bc8331526
+ | * changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent
| summary: Add only B
|
- | o changeset: 7:ba2ed02b0c9a
+ | * changeset: 7:ba2ed02b0c9a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan, content-divergent
@@ -1897,7 +1897,7 @@
| obsolete: rewritten using amend as 9:0b997eb7ceee
| summary: Add A,B,C
|
- o changeset: 5:dd800401bd8c
+ * changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -1925,19 +1925,19 @@
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o b18bc8331526
+ | * b18bc8331526
|/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
| multi-line: 8:b18bc8331526
| multi-line: 9:0b997eb7ceee
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
- o dd800401bd8c
+ * dd800401bd8c
|
o f897c6137566
|
@@ -1946,13 +1946,13 @@
$ hg fatelog
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
- o dd800401bd8c
+ * dd800401bd8c
|
o f897c6137566
|
@@ -1964,12 +1964,12 @@
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o b18bc8331526
+ | * b18bc8331526
|/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -1983,7 +1983,7 @@
| multi-line: 8:b18bc8331526
| multi-line: 9:0b997eb7ceee
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
- o dd800401bd8c
+ * dd800401bd8c
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -2019,13 +2019,13 @@
$ hg fatelog --hidden
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
- o dd800401bd8c
+ * dd800401bd8c
|
| x 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
@@ -2040,13 +2040,13 @@
$ hg fatelogjson --hidden
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
- o dd800401bd8c
+ * dd800401bd8c
|
| x 9bd10a0775e4
|/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
@@ -2063,22 +2063,22 @@
$ hg rebase -r 7 -d 8 --config extensions.rebase=
rebasing 7:ba2ed02b0c9a "Add A,B,C"
$ hg tlog
- o eceed8f98ffc
+ * eceed8f98ffc
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- o | b18bc8331526
+ * | b18bc8331526
|/ Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- o dd800401bd8c
+ * dd800401bd8c
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -2094,13 +2094,13 @@
$ hg fatelog
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
@@ -2112,18 +2112,18 @@
-----------------------------------
$ hg fatelogkw --hidden -q
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526
| Obsfate: rewritten using amend as 9:0b997eb7ceee
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -2137,18 +2137,18 @@
o ea207398892e
$ hg fatelogkw --hidden
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526
| Obsfate: rewritten using amend as 9:0b997eb7ceee
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -2162,18 +2162,18 @@
o ea207398892e
$ hg fatelogkw --hidden -v
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000)
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000)
| Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000)
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000)
@@ -2187,7 +2187,7 @@
o ea207398892e
$ hg log -G -T "default" --hidden
- o changeset: 10:eceed8f98ffc
+ * changeset: 10:eceed8f98ffc
| tag: tip
| parent: 8:b18bc8331526
| user: test
@@ -2195,14 +2195,14 @@
| instability: content-divergent
| summary: Add A,B,C
|
- | o changeset: 9:0b997eb7ceee
+ | * changeset: 9:0b997eb7ceee
| | parent: 5:dd800401bd8c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: content-divergent
| | summary: Add B only
| |
- o | changeset: 8:b18bc8331526
+ * | changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -2222,7 +2222,7 @@
| obsolete: rewritten using amend as 9:0b997eb7ceee
| summary: Add A,B,C
|
- o changeset: 5:dd800401bd8c
+ * changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000