--- a/tests/test-evolve-templates.t Mon May 29 17:10:45 2017 +0200
+++ b/tests/test-evolve-templates.t Mon May 29 17:13:21 2017 +0200
@@ -14,7 +14,7 @@
> [alias]
> tlog = log -G -T '{node|short}\
> {if(precursors, "\n Precursors: {precursors}")}\
- > \n Successors: {successors}\
+ > {if(successors, "\n Successors: {successors}")}\
> \n Fate: {obsfate_quiet}\n'
> EOF
@@ -71,13 +71,11 @@
$ hg tlog
o d004c8f274b9
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| @ 471f378eab4c
|/ Successors: [d004c8f274b9]
| Fate: superseed as d004c8f274b9
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(A1)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -88,61 +86,51 @@
$ hg tlog
o d004c8f274b9
| Precursors: a468dc9b3633
- | Successors:
| Fate:
| @ a468dc9b3633
|/ Successors: [d004c8f274b9]
| Fate: superseed as d004c8f274b9
o ea207398892e
- Successors:
Fate:
Precursors template should show the precursor as we force its display with
--hidden
$ hg tlog --hidden
o d004c8f274b9
| Precursors: a468dc9b3633
- | Successors:
| Fate:
| @ a468dc9b3633
|/ Precursors: 471f378eab4c
| Successors: [d004c8f274b9]
| Fate: superseed as d004c8f274b9
| x f137d23bb3e1
- | | Successors:
| | Fate: pruned
| x 471f378eab4c
|/ Successors: [a468dc9b3633]
| Fate: superseed as a468dc9b3633
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(A2)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tlog
@ d004c8f274b9
- | Successors:
| Fate:
o ea207398892e
- Successors:
Fate:
$ hg tlog --hidden
@ d004c8f274b9
| Precursors: a468dc9b3633
- | Successors:
| Fate:
| x a468dc9b3633
|/ Precursors: 471f378eab4c
| Successors: [d004c8f274b9]
| Fate: superseed as d004c8f274b9
| x f137d23bb3e1
- | | Successors:
| | Fate: pruned
| x 471f378eab4c
|/ Successors: [a468dc9b3633]
| Fate: superseed as a468dc9b3633
o ea207398892e
- Successors:
Fate:
Test templates with splitted commit
@@ -239,17 +227,14 @@
$ hg tlog
o f257fde29c7a
| Precursors: 471597cad322
- | Successors:
| Fate:
o 337fec4d2edc
| Precursors: 471597cad322
- | Successors:
| Fate:
| @ 471597cad322
|/ Successors: [337fec4d2edc, f257fde29c7a]
| Fate: superseed as 337fec4d2edc,f257fde29c7a
o ea207398892e
- Successors:
Fate:
$ hg up f257fde29c7a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -258,30 +243,24 @@
log
$ hg tlog
@ f257fde29c7a
- | Successors:
| Fate:
o 337fec4d2edc
- | Successors:
| Fate:
o ea207398892e
- Successors:
Fate:
Precursors template should show the precursor as we force its display with
--hidden
$ hg tlog --hidden
@ f257fde29c7a
| Precursors: 471597cad322
- | Successors:
| Fate:
o 337fec4d2edc
| Precursors: 471597cad322
- | Successors:
| Fate:
| x 471597cad322
|/ Successors: [337fec4d2edc, f257fde29c7a]
| Fate: superseed as 337fec4d2edc,f257fde29c7a
o ea207398892e
- Successors:
Fate:
Test templates with folded commit
==============================
@@ -349,13 +328,11 @@
$ hg tlog
o eb5a0daa2192
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| @ 471f378eab4c
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(B0)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -367,7 +344,6 @@
$ hg tlog
o eb5a0daa2192
| Precursors: 0dec01379d3b, 471f378eab4c
- | Successors:
| Fate:
| @ 0dec01379d3b
| | Successors: [eb5a0daa2192]
@@ -376,7 +352,6 @@
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(C0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -385,17 +360,14 @@
log
$ hg tlog
@ eb5a0daa2192
- | Successors:
| Fate:
o ea207398892e
- Successors:
Fate:
Precursors template should show both precursors as we force its display with
--hidden
$ hg tlog --hidden
@ eb5a0daa2192
| Precursors: 0dec01379d3b, 471f378eab4c
- | Successors:
| Fate:
| x 0dec01379d3b
| | Successors: [eb5a0daa2192]
@@ -404,7 +376,6 @@
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
Test templates with divergence
@@ -482,17 +453,14 @@
$ hg tlog
o 019fadeab383
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| o fdf9bde5129a
|/ Precursors: 471f378eab4c
- | Successors:
| Fate:
| @ 471f378eab4c
|/ Successors: [fdf9bde5129a], [019fadeab383]
| Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(A1)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -500,19 +468,15 @@
log
$ hg tlog
o 019fadeab383
- | Successors:
| Fate:
| @ fdf9bde5129a
- |/ Successors:
- | Fate:
+ |/ Fate:
o ea207398892e
- Successors:
Fate:
Precursors template should a precursor as we force its display with --hidden
$ hg tlog --hidden
o 019fadeab383
| Precursors: 65b757b745b9
- | Successors:
| Fate:
| x 65b757b745b9
|/ Precursors: 471f378eab4c
@@ -520,13 +484,11 @@
| Fate: superseed as 019fadeab383
| @ fdf9bde5129a
|/ Precursors: 471f378eab4c
- | Successors:
| Fate:
| x 471f378eab4c
|/ Successors: [fdf9bde5129a], [65b757b745b9]
| Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9
o ea207398892e
- Successors:
Fate:
Test templates with amended + folded commit
===========================================
@@ -605,13 +567,11 @@
$ hg tlog
o eb5a0daa2192
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| @ 471f378eab4c
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(B0)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -620,7 +580,6 @@
$ hg tlog
o eb5a0daa2192
| Precursors: 0dec01379d3b, 471f378eab4c
- | Successors:
| Fate:
| @ 0dec01379d3b
| | Successors: [eb5a0daa2192]
@@ -629,7 +588,6 @@
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(B1)' --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -638,7 +596,6 @@
$ hg tlog
o eb5a0daa2192
| Precursors: 471f378eab4c, b7ea6d14e664
- | Successors:
| Fate:
| @ b7ea6d14e664
| | Successors: [eb5a0daa2192]
@@ -647,21 +604,17 @@
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(C0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tlog
@ eb5a0daa2192
- | Successors:
| Fate:
o ea207398892e
- Successors:
Fate:
$ hg tlog --hidden
@ eb5a0daa2192
| Precursors: 471f378eab4c, b7ea6d14e664
- | Successors:
| Fate:
| x b7ea6d14e664
| | Precursors: 0dec01379d3b
@@ -674,7 +627,6 @@
|/ Successors: [eb5a0daa2192]
| Fate: superseed as eb5a0daa2192
o ea207398892e
- Successors:
Fate:
Test template with pushed and pulled obs markers
@@ -767,31 +719,25 @@
$ hg tlog
o 7a230b46bf61
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| @ 471f378eab4c
|/ Successors: [7a230b46bf61]
| Fate: superseed as 7a230b46bf61
o ea207398892e
- Successors:
Fate:
$ hg up 'desc(A2)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tlog
@ 7a230b46bf61
- | Successors:
| Fate:
o ea207398892e
- Successors:
Fate:
$ hg tlog --hidden
@ 7a230b46bf61
| Precursors: 471f378eab4c
- | Successors:
| Fate:
| x 471f378eab4c
|/ Successors: [7a230b46bf61]
| Fate: superseed as 7a230b46bf61
o ea207398892e
- Successors:
Fate: