Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-templates.t
changeset 2590 0d7dec71646d
parent 2589 8412b0b7b512
child 2591 1991935fb603 
--- a/tests/test-evolve-templates.t	Fri Jun 09 00:10:27 2017 +0100
+++ b/tests/test-evolve-templates.t	Fri Jun 09 00:31:00 2017 +0100
@@ -18,6 +18,8 @@
   >     {if(successors, "\n  Successors: {successors}")}\
   >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\
   >     {if(obsfate_quiet, "\n  Fate: {obsfate_quiet}")}\n'
+  > fatelog = log -G -T '{node|short}\n'
+  > fatelogjson = log -G -T '{node|short}\n'
   > EOF
 
 Test templates on amended commit
@@ -70,6 +72,15 @@
   (use 'hg evolve' to update to its successor: d004c8f274b9)
 
 Precursors template should show current revision as it is the working copy
+  $ hg olog tip
+  o  d004c8f274b9 (4) A2
+  |
+  x  a468dc9b3633 (3) A1
+  |    rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9
+  |
+  @  471f378eab4c (1) A0
+       rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633
+  
   $ hg tlog
   o  d004c8f274b9
   |    Precursors: 471f378eab4c
@@ -80,6 +91,27 @@
   |      Fate: superseed as d004c8f274b9
   o  ea207398892e
   
+  $ hg fatelog -q
+  o  d004c8f274b9
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
+  $ hg fatelog
+  o  d004c8f274b9
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
+  $ hg fatelog -v
+  o  d004c8f274b9
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
   $ hg up 'desc(A1)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (a468dc9b3633)
@@ -116,7 +148,13 @@
   |      Fate: superseed as a468dc9b3633
   o  ea207398892e
   
-
+  $ hg fatelog -v
+  o  d004c8f274b9
+  |
+  | @  a468dc9b3633
+  |/
+  o  ea207398892e
+  
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -142,6 +180,35 @@
   |      Fate: superseed as a468dc9b3633
   o  ea207398892e
   
+  $ hg fatelog -v
+  @  d004c8f274b9
+  |
+  o  ea207398892e
+  
+
+  $ hg fatelog -v --hidden
+  @  d004c8f274b9
+  |
+  | x  a468dc9b3633
+  |/
+  | x  f137d23bb3e1
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
+  $ hg fatelogjson --hidden
+  @  d004c8f274b9
+  |
+  | x  a468dc9b3633
+  |/
+  | x  f137d23bb3e1
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
 
 Test templates with splitted commit
 ===================================
@@ -247,6 +314,16 @@
   |      Fate: superseed as 337fec4d2edc,f257fde29c7a
   o  ea207398892e
   
+  $ hg fatelog
+  o  f257fde29c7a
+  |
+  o  337fec4d2edc
+  |
+  | @  471597cad322
+  |/
+  o  ea207398892e
+  
+
   $ hg up f257fde29c7a
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -274,6 +351,26 @@
   |      Fate: superseed as 337fec4d2edc,f257fde29c7a
   o  ea207398892e
   
+  $ hg fatelog --hidden
+  @  f257fde29c7a
+  |
+  o  337fec4d2edc
+  |
+  | x  471597cad322
+  |/
+  o  ea207398892e
+  
+
+  $ hg fatelogjson --hidden
+  @  f257fde29c7a
+  |
+  o  337fec4d2edc
+  |
+  | x  471597cad322
+  |/
+  o  ea207398892e
+  
+
 Test templates with folded commit
 ==============================
 
@@ -347,6 +444,13 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog
+  o  eb5a0daa2192
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
   $ hg up 'desc(B0)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
@@ -368,6 +472,16 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog
+  o  eb5a0daa2192
+  |
+  | @  0dec01379d3b
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
   $ hg up 'desc(C0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -394,6 +508,25 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog --hidden
+  @  eb5a0daa2192
+  |
+  | x  0dec01379d3b
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
+  $ hg fatelogjson --hidden
+  @  eb5a0daa2192
+  |
+  | x  0dec01379d3b
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
 
 Test templates with divergence
 ==============================
@@ -480,6 +613,16 @@
   |      Fate: superseed as fdf9bde5129a + superseed as 019fadeab383
   o  ea207398892e
   
+  $ hg fatelog
+  o  019fadeab383
+  |
+  | o  fdf9bde5129a
+  |/
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
   $ 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
@@ -491,6 +634,14 @@
   |/
   o  ea207398892e
   
+
+  $ hg fatelog
+  o  019fadeab383
+  |
+  | @  fdf9bde5129a
+  |/
+  o  ea207398892e
+  
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
   o  019fadeab383
@@ -511,6 +662,30 @@
   |      Fate: superseed as fdf9bde5129a + superseed as 65b757b745b9
   o  ea207398892e
   
+  $ hg fatelog --hidden
+  o  019fadeab383
+  |
+  | x  65b757b745b9
+  |/
+  | @  fdf9bde5129a
+  |/
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
+  $ hg fatelogjson --hidden
+  o  019fadeab383
+  |
+  | x  65b757b745b9
+  |/
+  | @  fdf9bde5129a
+  |/
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
 Test templates with amended + folded commit
 ===========================================
 
@@ -595,6 +770,13 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog
+  o  eb5a0daa2192
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
   $ hg up 'desc(B0)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (0dec01379d3b)
@@ -613,6 +795,16 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog
+  o  eb5a0daa2192
+  |
+  | @  0dec01379d3b
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
   $ hg up 'desc(B1)' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (b7ea6d14e664)
@@ -631,6 +823,16 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog
+  o  eb5a0daa2192
+  |
+  | @  b7ea6d14e664
+  | |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
   $ hg up 'desc(C0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -658,6 +860,28 @@
   |      Fate: superseed as eb5a0daa2192
   o  ea207398892e
   
+  $ hg fatelog --hidden
+  @  eb5a0daa2192
+  |
+  | x  b7ea6d14e664
+  | |
+  | | x  0dec01379d3b
+  | |/
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+  $ hg fatelogjson --hidden
+  @  eb5a0daa2192
+  |
+  | x  b7ea6d14e664
+  | |
+  | | x  0dec01379d3b
+  | |/
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
 
 Test template with pushed and pulled obs markers
 ==============================================
@@ -756,6 +980,13 @@
   |      Fate: superseed as 7a230b46bf61
   o  ea207398892e
   
+  $ hg fatelog --hidden -v
+  o  7a230b46bf61
+  |
+  | @  471f378eab4c
+  |/
+  o  ea207398892e
+  
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -763,6 +994,11 @@
   |
   o  ea207398892e
   
+  $ hg fatelog -v
+  @  7a230b46bf61
+  |
+  o  ea207398892e
+  
   $ hg tlog --hidden
   @  7a230b46bf61
   |    Precursors: 471f378eab4c
@@ -773,3 +1009,51 @@
   |      Fate: superseed as 7a230b46bf61
   o  ea207398892e
   
+  $ hg fatelog --hidden -v
+  @  7a230b46bf61
+  |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
+  $ hg fatelogjson --hidden
+  @  7a230b46bf61
+  |
+  | x  471f378eab4c
+  |/
+  o  ea207398892e
+  
+
+Test templates with pruned commits
+==================================
+
+Test setup
+----------
+
+  $ hg init $TESTTMP/templates-local-prune
+  $ cd $TESTTMP/templates-local-prune
+  $ mkcommit ROOT
+  $ mkcommit A0
+  $ hg prune .
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  working directory now at ea207398892e
+  1 changesets pruned
+
+Check output
+------------
+
+  $ hg up "desc(A0)" --hidden
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory parent is obsolete! (471f378eab4c)
+  (use 'hg evolve' to update to its parent successor)
+  $ hg tlog
+  @  471f378eab4c
+  |    Fate: pruned
+  o  ea207398892e
+  
+  $ hg fatelog -v
+  @  471f378eab4c
+  |
+  o  ea207398892e
+
evolve