Mercurial > evolve
changeset 2495:0db53f48db2d
template: move each template on its own line during tests
This will clarify the various coming changes around template.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 May 2017 16:59:59 +0200 |
| parents | 17bc96b54255 |
| children | 5ed8af9c4a21 |
| files | tests/test-evolve-templates.t |
| diffstat | 1 files changed, 321 insertions(+), 161 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-templates.t Mon May 29 11:03:13 2017 +0200 +++ b/tests/test-evolve-templates.t Mon May 29 16:59:59 2017 +0200 @@ -12,7 +12,7 @@ > [extensions] > evolve = > [alias] - > tlog = log -G -T '{node|short} Precursors: {precursors} | Successors: {successors} | Fate: {obsfate_quiet}\n' + > tlog = log -G -T '{node|short}\n Precursors: {precursors}\n Successors: {successors}\n Fate: {obsfate_quiet}\n' > EOF Test templates on amended commit @@ -66,12 +66,18 @@ Precursors template should show current revision as it is the working copy $ hg tlog - o d004c8f274b9 Precursors: 471f378eab4c | Successors: | Fate: - | - | @ 471f378eab4c Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o d004c8f274b9 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | @ 471f378eab4c + |/ Precursors: + | Successors: [d004c8f274b9] + | Fate: superseed as d004c8f274b9 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(A1)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (a468dc9b3633) @@ -79,44 +85,74 @@ Precursors template should show current revision as it is the working copy $ hg tlog - o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: - | - | @ a468dc9b3633 Precursors: | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o d004c8f274b9 + | Precursors: a468dc9b3633 + | Successors: + | Fate: + | @ a468dc9b3633 + |/ Precursors: + | Successors: [d004c8f274b9] + | Fate: superseed as d004c8f274b9 + o ea207398892e + Precursors: + 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 Precursors: | Successors: | Fate: pruned - | | - | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as a468dc9b3633 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o d004c8f274b9 + | Precursors: a468dc9b3633 + | Successors: + | Fate: + | @ a468dc9b3633 + |/ Precursors: 471f378eab4c + | Successors: [d004c8f274b9] + | Fate: superseed as d004c8f274b9 + | x f137d23bb3e1 + | | Precursors: + | | Successors: + | | Fate: pruned + | x 471f378eab4c + |/ Precursors: + | Successors: [a468dc9b3633] + | Fate: superseed as a468dc9b3633 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(A2)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tlog - @ d004c8f274b9 Precursors: | Successors: | Fate: - | - o ea207398892e Precursors: | Successors: | Fate: - + @ d004c8f274b9 + | Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + Successors: + Fate: $ hg tlog --hidden - @ d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate: - | - | x a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed as d004c8f274b9 - |/ - | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned - | | - | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed as a468dc9b3633 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + @ d004c8f274b9 + | Precursors: a468dc9b3633 + | Successors: + | Fate: + | x a468dc9b3633 + |/ Precursors: 471f378eab4c + | Successors: [d004c8f274b9] + | Fate: superseed as d004c8f274b9 + | x f137d23bb3e1 + | | Precursors: + | | Successors: + | | Fate: pruned + | x 471f378eab4c + |/ Precursors: + | Successors: [a468dc9b3633] + | Fate: superseed as a468dc9b3633 + o ea207398892e + Precursors: + Successors: + Fate: Test templates with splitted commit =================================== @@ -210,37 +246,59 @@ Precursors template should show current revision as it is the working copy $ hg tlog - o f257fde29c7a Precursors: 471597cad322 | Successors: | Fate: - | - o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate: - | - | @ 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o f257fde29c7a + | Precursors: 471597cad322 + | Successors: + | Fate: + o 337fec4d2edc + | Precursors: 471597cad322 + | Successors: + | Fate: + | @ 471597cad322 + |/ Precursors: + | Successors: [337fec4d2edc, f257fde29c7a] + | Fate: superseed as 337fec4d2edc,f257fde29c7a + o ea207398892e + Precursors: + Successors: + Fate: $ 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 log $ hg tlog - @ f257fde29c7a Precursors: | Successors: | Fate: - | - o 337fec4d2edc Precursors: | Successors: | Fate: - | - o ea207398892e Precursors: | Successors: | Fate: - + @ f257fde29c7a + | Precursors: + | Successors: + | Fate: + o 337fec4d2edc + | Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + 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 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed as 337fec4d2edc,f257fde29c7a - |/ - o ea207398892e Precursors: | Successors: | Fate: - + @ f257fde29c7a + | Precursors: 471597cad322 + | Successors: + | Fate: + o 337fec4d2edc + | Precursors: 471597cad322 + | Successors: + | Fate: + | x 471597cad322 + |/ Precursors: + | Successors: [337fec4d2edc, f257fde29c7a] + | Fate: superseed as 337fec4d2edc,f257fde29c7a + o ea207398892e + Precursors: + Successors: + Fate: Test templates with folded commit ============================== @@ -305,12 +363,18 @@ Precursors template should show current revision as it is the working copy $ hg tlog - o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: - | - | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o eb5a0daa2192 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | @ 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(B0)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) @@ -319,35 +383,55 @@ Precursors template should show both precursors as they should be both displayed $ hg tlog - o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: - | - | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - | | - | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o eb5a0daa2192 + | Precursors: 0dec01379d3b, 471f378eab4c + | Successors: + | Fate: + | @ 0dec01379d3b + | | Precursors: + | | Successors: [eb5a0daa2192] + | | Fate: superseed as eb5a0daa2192 + | x 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: $ 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 log $ hg tlog - @ eb5a0daa2192 Precursors: | Successors: | Fate: - | - o ea207398892e Precursors: | Successors: | Fate: - + @ eb5a0daa2192 + | Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + 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 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - | | - | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + @ eb5a0daa2192 + | Precursors: 0dec01379d3b, 471f378eab4c + | Successors: + | Fate: + | x 0dec01379d3b + | | Precursors: + | | Successors: [eb5a0daa2192] + | | Fate: superseed as eb5a0daa2192 + | x 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: Test templates with divergence ============================== @@ -422,37 +506,61 @@ Precursors template should show current revision as it is the working copy $ hg tlog - o 019fadeab383 Precursors: 471f378eab4c | Successors: | Fate: - | - | o fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: - |/ - | @ 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [019fadeab383] | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o 019fadeab383 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | o fdf9bde5129a + |/ Precursors: 471f378eab4c + | Successors: + | Fate: + | @ 471f378eab4c + |/ Precursors: + | Successors: [fdf9bde5129a], [019fadeab383] + | Fate: superseed as fdf9bde5129a + superseed as 019fadeab383 + o ea207398892e + Precursors: + Successors: + Fate: $ 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 log $ hg tlog - o 019fadeab383 Precursors: | Successors: | Fate: - | - | @ fdf9bde5129a Precursors: | Successors: | Fate: - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o 019fadeab383 + | Precursors: + | Successors: + | Fate: + | @ fdf9bde5129a + |/ Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + 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 | Successors: [019fadeab383] | Fate: superseed as 019fadeab383 - |/ - | @ fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate: - |/ - | x 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [65b757b745b9] | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o 019fadeab383 + | Precursors: 65b757b745b9 + | Successors: + | Fate: + | x 65b757b745b9 + |/ Precursors: 471f378eab4c + | Successors: [019fadeab383] + | Fate: superseed as 019fadeab383 + | @ fdf9bde5129a + |/ Precursors: 471f378eab4c + | Successors: + | Fate: + | x 471f378eab4c + |/ Precursors: + | Successors: [fdf9bde5129a], [65b757b745b9] + | Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9 + o ea207398892e + Precursors: + Successors: + Fate: Test templates with amended + folded commit =========================================== @@ -528,56 +636,92 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog - o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate: - | - | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o eb5a0daa2192 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | @ 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(B0)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog - o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate: - | - | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - | | - | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o eb5a0daa2192 + | Precursors: 0dec01379d3b, 471f378eab4c + | Successors: + | Fate: + | @ 0dec01379d3b + | | Precursors: + | | Successors: [eb5a0daa2192] + | | Fate: superseed as eb5a0daa2192 + | x 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(B1)' --hidden 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (b7ea6d14e664) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog - o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: - | - | @ b7ea6d14e664 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - | | - | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o eb5a0daa2192 + | Precursors: 471f378eab4c, b7ea6d14e664 + | Successors: + | Fate: + | @ b7ea6d14e664 + | | Precursors: + | | Successors: [eb5a0daa2192] + | | Fate: superseed as eb5a0daa2192 + | x 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(C0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tlog - @ eb5a0daa2192 Precursors: | Successors: | Fate: - | - o ea207398892e Precursors: | Successors: | Fate: - + @ eb5a0daa2192 + | Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + Successors: + Fate: $ hg tlog --hidden - @ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate: - | - | x b7ea6d14e664 Precursors: 0dec01379d3b | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - | | - | | x 0dec01379d3b Precursors: | Successors: [b7ea6d14e664] | Fate: superseed as b7ea6d14e664 - | |/ - | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed as eb5a0daa2192 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + @ eb5a0daa2192 + | Precursors: 471f378eab4c, b7ea6d14e664 + | Successors: + | Fate: + | x b7ea6d14e664 + | | Precursors: 0dec01379d3b + | | Successors: [eb5a0daa2192] + | | Fate: superseed as eb5a0daa2192 + | | x 0dec01379d3b + | |/ Precursors: + | | Successors: [b7ea6d14e664] + | | Fate: superseed as b7ea6d14e664 + | x 471f378eab4c + |/ Precursors: + | Successors: [eb5a0daa2192] + | Fate: superseed as eb5a0daa2192 + o ea207398892e + Precursors: + Successors: + Fate: Test template with pushed and pulled obs markers ============================================== @@ -667,23 +811,39 @@ --------------- $ hg tlog - o 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: - | - | @ 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + o 7a230b46bf61 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | @ 471f378eab4c + |/ Precursors: + | Successors: [7a230b46bf61] + | Fate: superseed as 7a230b46bf61 + o ea207398892e + Precursors: + Successors: + Fate: $ hg up 'desc(A2)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tlog - @ 7a230b46bf61 Precursors: | Successors: | Fate: - | - o ea207398892e Precursors: | Successors: | Fate: - + @ 7a230b46bf61 + | Precursors: + | Successors: + | Fate: + o ea207398892e + Precursors: + Successors: + Fate: $ hg tlog --hidden - @ 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate: - | - | x 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed as 7a230b46bf61 - |/ - o ea207398892e Precursors: | Successors: | Fate: - + @ 7a230b46bf61 + | Precursors: 471f378eab4c + | Successors: + | Fate: + | x 471f378eab4c + |/ Precursors: + | Successors: [7a230b46bf61] + | Fate: superseed as 7a230b46bf61 + o ea207398892e + Precursors: + Successors: + Fate: