diff tests/test-evolve-templates.t @ 2617:da0d3d4171cb mercurial-3.9

test-compat: merge with mercurial-4.0

--- a/tests/test-evolve-templates.t	Fri Jun 16 11:54:01 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Jun 16 19:48:10 2017 +0200
@@ -78,13 +78,17 @@
   |      semi-colon: [d004c8f274b9]
   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)
+  (use 'hg evolve' to update to its successor: d004c8f274b9)
 
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  d004c8f274b9
-  |    Precursors: 471f378eab4c
-  |    semi-colon: 471f378eab4c
-  | @  471f378eab4c
+  |    Precursors: a468dc9b3633
+  |    semi-colon: a468dc9b3633
+  | @  a468dc9b3633
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
   o  ea207398892e
@@ -95,29 +99,28 @@
   o  d004c8f274b9
   |    Precursors: a468dc9b3633
   |    semi-colon: a468dc9b3633
-  | x  a468dc9b3633
+  | @  a468dc9b3633
   |/     Precursors: 471f378eab4c
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
   | x  f137d23bb3e1
   | |
-  | @  471f378eab4c
+  | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
   o  ea207398892e
   
+
+  $ hg up 'desc(A2)'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
-  o  d004c8f274b9
-  |    Precursors: 471f378eab4c
-  |    semi-colon: 471f378eab4c
-  | @  471f378eab4c
-  |/     Successors: [d004c8f274b9]
-  |      semi-colon: [d004c8f274b9]
+  @  d004c8f274b9
+  |
   o  ea207398892e
   
   $ hg tlog --hidden
-  o  d004c8f274b9
+  @  d004c8f274b9
   |    Precursors: a468dc9b3633
   |    semi-colon: a468dc9b3633
   | x  a468dc9b3633
@@ -127,7 +130,7 @@
   |      semi-colon: [d004c8f274b9]
   | x  f137d23bb3e1
   | |
-  | @  471f378eab4c
+  | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
   o  ea207398892e
@@ -335,19 +338,27 @@
   |      semi-colon: [eb5a0daa2192]
   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)
+  (use 'hg evolve' to update to its successor: eb5a0daa2192)
+
 Precursors template should show both precursors as they should be both
 displayed
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 471f378eab4c
-  |    semi-colon: 471f378eab4c
-  | @  471f378eab4c
+  |    Precursors: 0dec01379d3b 471f378eab4c
+  |    semi-colon: 0dec01379d3b; 471f378eab4c
+  | @  0dec01379d3b
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
+  | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
   o  ea207398892e
   
   $ hg up 'desc(C0)'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  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
@@ -464,6 +475,26 @@
   |/
   o  ea207398892e
   
+
+Precursors template should a precursor as we force its display with --hidden
+  $ hg tlog --hidden
+  o  019fadeab383
+  |    Precursors: 65b757b745b9
+  |    semi-colon: 65b757b745b9
+  | x  65b757b745b9
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
+  |      Successors: [019fadeab383]
+  |      semi-colon: [019fadeab383]
+  | @  fdf9bde5129a
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
+  | x  471f378eab4c
+  |/     Successors: [fdf9bde5129a], [65b757b745b9]
+  |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
+  o  ea207398892e
+  
+
 Test templates with amended + folded commit
 ===========================================
 
@@ -547,8 +578,49 @@
   |      semi-colon: [eb5a0daa2192]
   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)
+  (use 'hg evolve' to update to its successor: eb5a0daa2192)
+  $ hg tlog
+  o  eb5a0daa2192
+  |    Precursors: 0dec01379d3b 471f378eab4c
+  |    semi-colon: 0dec01379d3b; 471f378eab4c
+  | @  0dec01379d3b
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
+  | x  471f378eab4c
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
+  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)
+  (use 'hg evolve' to update to its successor: eb5a0daa2192)
+  $ hg tlog
+  o  eb5a0daa2192
+  |    Precursors: 471f378eab4c b7ea6d14e664
+  |    semi-colon: 471f378eab4c; b7ea6d14e664
+  | @  b7ea6d14e664
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
+  | x  471f378eab4c
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
+  o  ea207398892e
+  
+
+  $ hg up 'desc(C0)'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg tlog
+  @  eb5a0daa2192
+  |
+  o  ea207398892e
+  
   $ hg tlog --hidden
-  o  eb5a0daa2192
+  @  eb5a0daa2192
   |    Precursors: 471f378eab4c b7ea6d14e664
   |    semi-colon: 471f378eab4c; b7ea6d14e664
   | x  b7ea6d14e664
@@ -559,7 +631,7 @@
   | | x  0dec01379d3b
   | |/     Successors: [b7ea6d14e664]
   | |      semi-colon: [b7ea6d14e664]
-  | @  471f378eab4c
+  | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
   o  ea207398892e