diff -r 0471b9ddd0b2 -r 844b1ad5b34b tests/test-evolve-obshistory-lots-of-splits.t
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Wed Apr 08 01:17:01 2020 +0800
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Fri May 08 22:50:09 2020 +0800
@@ -1,5 +1,4 @@
-This test file test the various messages when accessing obsolete
-revisions.
+Testing obslog and other commands accessing obsolete revisions.
 
 Global setup
 ============
@@ -160,12 +159,12 @@
 Actual test
 -----------
 
-  $ hg obslog de7290d8b885 --hidden --patch
+  $ hg obslog de7290d8b885 --hidden --patch --no-origin
   x  de7290d8b885 (1) A0
        split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
-  $ hg obslog de7290d8b885 --hidden --all --patch
+  $ hg obslog de7290d8b885 --hidden --all --patch --no-origin
   o  1ae8bc733a14 (4) A0
   |
   | o  337fec4d2edc (2) A0
@@ -178,27 +177,67 @@
        split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
-  $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
+  $ hg obslog de7290d8b885 --hidden --all --patch
+  o  1ae8bc733a14 (4) A0
+  |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, changesets rebased)
+  |
+  | o  337fec4d2edc (2) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        diff -r de7290d8b885 -r 337fec4d2edc b
+  |        --- a/b	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -43
+  |        diff -r de7290d8b885 -r 337fec4d2edc c
+  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -44
+  |        diff -r de7290d8b885 -r 337fec4d2edc d
+  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -45
+  |
+  |
+  | @  c7f044602e9b (5) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
+  | o  f257fde29c7a (3) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
+  x  de7290d8b885 (1) A0
+  
+  $ hg obslog de7290d8b885 --hidden --no-graph --no-origin -Tjson | python -m json.tool
   [
       {
           "markers": [
               {
-                  "date": [
-                      *, (glob)
-                      0
+                  "dates": [
+                      [
+                          *, (glob)
+                          0
+                      ]
                   ],
                   "effects": [
                       "parent",
                       "content"
                   ],
-                  "operation": "split",
+                  "operations": [
+                      "split"
+                  ],
                   "succnodes": [
                       "1ae8bc733a14e374f11767d2ad128d4c891dc43f",
                       "337fec4d2edcf0e7a467e35f818234bc620068b5",
                       "c7f044602e9bd5dec6528b33114df3d0221e6359",
                       "f257fde29c7a847c9b607f6e958656d0df0fb15c"
                   ],
-                  "user": "test",
+                  "users": [
+                      "test"
+                  ],
                   "verb": "split"
               }
           ],
@@ -206,14 +245,21 @@
           "shortdescription": "A0"
       }
   ]
-  $ hg obslog c7f044602e9b --patch
+  $ hg obslog c7f044602e9b --patch --no-origin
   @  c7f044602e9b (5) A0
   |
   x  de7290d8b885 (1) A0
        split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
          (No patch available, too many successors (4))
   
-  $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
+  $ hg obslog c7f044602e9b --patch
+  @  c7f044602e9b (5) A0
+  |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, changesets rebased)
+  |
+  x  de7290d8b885 (1) A0
+  
+  $ hg obslog c7f044602e9b --no-graph --no-origin -Tjson | python -m json.tool
   [
       {
           "markers": [],
@@ -223,22 +269,28 @@
       {
           "markers": [
               {
-                  "date": [
-                      *, (glob)
-                      0
+                  "dates": [
+                      [
+                          *, (glob)
+                          0
+                      ]
                   ],
                   "effects": [
                       "parent",
                       "content"
                   ],
-                  "operation": "split",
+                  "operations": [
+                      "split"
+                  ],
                   "succnodes": [
                       "1ae8bc733a14e374f11767d2ad128d4c891dc43f",
                       "337fec4d2edcf0e7a467e35f818234bc620068b5",
                       "c7f044602e9bd5dec6528b33114df3d0221e6359",
                       "f257fde29c7a847c9b607f6e958656d0df0fb15c"
                   ],
-                  "user": "test",
+                  "users": [
+                      "test"
+                  ],
                   "verb": "split"
               }
           ],
@@ -246,9 +298,92 @@
           "shortdescription": "A0"
       }
   ]
-Check that debugobshistory on all heads show a coherent graph
+  $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
+  [
+      {
+          "markers": [
+              {
+                  "dates": [
+                      [
+                          *, (glob)
+                          0
+                      ]
+                  ],
+                  "effects": [
+                      "parent",
+                      "content"
+                  ],
+                  "operations": [
+                      "split"
+                  ],
+                  "prednodes": [
+                      "de7290d8b885925115bb9e88887252dfc20ef2a8"
+                  ],
+                  "users": [
+                      "test"
+                  ],
+                  "verb": "split"
+              }
+          ],
+          "node": "c7f044602e9bd5dec6528b33114df3d0221e6359",
+          "shortdescription": "A0"
+      },
+      {
+          "markers": [],
+          "node": "de7290d8b885925115bb9e88887252dfc20ef2a8",
+          "shortdescription": "A0"
+      }
+  ]
+Check that obslog on all heads shows a coherent graph
+  $ hg obslog 2::5 --patch --no-origin
+  o  1ae8bc733a14 (4) A0
+  |
+  | o  337fec4d2edc (2) A0
+  |/
+  | @  c7f044602e9b (5) A0
+  |/
+  | o  f257fde29c7a (3) A0
+  |/
+  x  de7290d8b885 (1) A0
+       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+         (No patch available, too many successors (4))
+  
   $ hg obslog 2::5 --patch
   o  1ae8bc733a14 (4) A0
+  |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, changesets rebased)
+  |
+  | o  337fec4d2edc (2) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        diff -r de7290d8b885 -r 337fec4d2edc b
+  |        --- a/b	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -43
+  |        diff -r de7290d8b885 -r 337fec4d2edc c
+  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -44
+  |        diff -r de7290d8b885 -r 337fec4d2edc d
+  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -45
+  |
+  |
+  | @  c7f044602e9b (5) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
+  | o  f257fde29c7a (3) A0
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
+  x  de7290d8b885 (1) A0
+  
+  $ hg obslog 5 --all --patch --no-origin
+  o  1ae8bc733a14 (4) A0
   |
   | o  337fec4d2edc (2) A0
   |/
@@ -262,16 +397,37 @@
   
   $ hg obslog 5 --all --patch
   o  1ae8bc733a14 (4) A0
+  |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, changesets rebased)
   |
   | o  337fec4d2edc (2) A0
-  |/
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        diff -r de7290d8b885 -r 337fec4d2edc b
+  |        --- a/b	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -43
+  |        diff -r de7290d8b885 -r 337fec4d2edc c
+  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -44
+  |        diff -r de7290d8b885 -r 337fec4d2edc d
+  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
+  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |        @@ -1,1 +0,0 @@
+  |        -45
+  |
+  |
   | @  c7f044602e9b (5) A0
-  |/
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
   | o  f257fde29c7a (3) A0
-  |/
+  |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, changesets rebased)
+  |
   x  de7290d8b885 (1) A0
-       split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
-         (No patch available, too many successors (4))
   
   $ hg update de7290d8b885
   abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!