tests/test-evolve-cycles.t
branchmercurial-4.3
changeset 3716 e5ba6531503e
parent 3591 98941c28f3e2
--- a/tests/test-evolve-cycles.t	Mon Apr 23 12:23:00 2018 +0200
+++ b/tests/test-evolve-cycles.t	Wed Apr 25 01:58:45 2018 +0100
@@ -89,48 +89,48 @@
 
   $ hg obslog "desc(A)" --hidden
   @  2a34000d3544 (1) A
-  |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  a8df460dbbfe (3) C
-  |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-  |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   |
 
   $ hg obslog "desc(B)" --hidden
   @  2a34000d3544 (1) A
-  |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  a8df460dbbfe (3) C
-  |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-  |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   |
 
   $ hg obslog "desc(C)" --hidden
   @  2a34000d3544 (1) A
-  |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  a8df460dbbfe (3) C
-  |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-  |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   |
 
 Check that all option don't crash on a cycle either
 
   $ hg obslog "desc(C)" --hidden --all
   @  2a34000d3544 (1) A
-  |    rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  a8df460dbbfe (3) C
-  |    rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c473644ee0e9 (2) B
-  |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   |
 
 Test with multiple cyles
@@ -252,42 +252,42 @@
 
   $ hg obslog "desc(D)" --hidden
   x  0da815c333f6 (5) E
-  |    rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   @    868d2e0eb19c (4) D
-  |\     rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  d9f908fde1a1 (6) F
-  | |    rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   +---x  2a34000d3544 (1) A
-  | |      rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a8df460dbbfe (3) C
-  | |    rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  c473644ee0e9 (2) B
-  | |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
 Check that all option don't crash either on a cycle
   $ hg obslog --all --hidden "desc(F)"
   x  0da815c333f6 (5) E
-  |    rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   @    868d2e0eb19c (4) D
-  |\     rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  d9f908fde1a1 (6) F
-  | |    rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   +---x  2a34000d3544 (1) A
-  | |      rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a8df460dbbfe (3) C
-  | |    rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  c473644ee0e9 (2) B
-  | |    rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
 Check the json output is valid in this case
 
@@ -300,6 +300,11 @@
                       *, (glob)
                       0
                   ],
+                  "effect": [
+                      *, (glob)
+                      *, (glob)
+                      "content"
+                  ],
                   "succnodes": [
                       "0da815c333f6"
                   ],
@@ -318,6 +323,11 @@
                       *, (glob)
                       0
                   ],
+                  "effect": [
+                      *, (glob)
+                      *, (glob)
+                      "content"
+                  ],
                   "succnodes": [
                       "868d2e0eb19c"
                   ],
@@ -333,9 +343,14 @@
           "markers": [
               {
                   "date": [
-                      *, (glob)
+                      0.0,
                       0
                   ],
+                  "effect": [
+                      "description",
+                      "parent",
+                      "content"
+                  ],
                   "succnodes": [
                       "d9f908fde1a1"
                   ],
@@ -351,9 +366,14 @@
           "markers": [
               {
                   "date": [
-                      *, (glob)
+                      0.0,
                       0
                   ],
+                  "effect": [
+                      "description",
+                      "parent",
+                      "content"
+                  ],
                   "succnodes": [
                       "2a34000d3544",
                       "868d2e0eb19c"
@@ -370,9 +390,14 @@
           "markers": [
               {
                   "date": [
-                      *, (glob)
+                      0.0,
                       0
                   ],
+                  "effect": [
+                      "description",
+                      "parent",
+                      "content"
+                  ],
                   "succnodes": [
                       "a8df460dbbfe"
                   ],
@@ -388,9 +413,14 @@
           "markers": [
               {
                   "date": [
-                      *, (glob)
+                      0.0,
                       0
                   ],
+                  "effect": [
+                      "description",
+                      "parent",
+                      "content"
+                  ],
                   "succnodes": [
                       "c473644ee0e9"
                   ],