--- a/tests/test-evolve-obshistory.t	Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-obshistory.t	Thu May 07 01:29:48 2020 +0200
@@ -93,7 +93,7 @@
 Actual test
 -----------
 
-  $ hg obslog 7a230b46bf61 --patch
+  $ hg obslog 7a230b46bf61 --patch --no-origin
   @  7a230b46bf61 (3) A2
   |
   x  fdf9bde5129a (2) A1
@@ -116,6 +116,31 @@
          +A1
   
   
+
+  $ hg obslog 7a230b46bf61 --patch
+  @  7a230b46bf61 (3) A2
+  |    reworded(description) from fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
+  |      --- a/changeset-description
+  |      +++ b/changeset-description
+  |      @@ -1,1 +1,1 @@
+  |      -A1
+  |      +A2
+  |
+  |
+  x  fdf9bde5129a (2) A1
+  |    reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r 471f378eab4c -r fdf9bde5129a changeset-description
+  |      --- a/changeset-description
+  |      +++ b/changeset-description
+  |      @@ -1,1 +1,1 @@
+  |      -A0
+  |      +A1
+  |
+  |
+  x  471f378eab4c (1) A0
+  
+
   $ cd $TESTTMP/local-remote-markers-2
   $ hg pull
   pulling from $TESTTMP/local-remote-markers-1
@@ -131,7 +156,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
 Check that obslog works with markers pointing to missing local changectx
-  $ hg obslog 7a230b46bf61 --patch
+  $ hg obslog 7a230b46bf61 --patch --no-origin
   o  7a230b46bf61 (2) A2
   |
   x  fdf9bde5129a
@@ -143,7 +168,19 @@
          (No patch available, successor is unknown locally)
   
 
-  $ hg obslog 7a230b46bf61 --patch -f
+  $ hg obslog 7a230b46bf61 --patch
+  o  7a230b46bf61 (2) A2
+  |    reworded(description) from fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, predecessor is unknown locally)
+  |
+  x  fdf9bde5129a
+  |    reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, context is not local)
+  |
+  @  471f378eab4c (1) A0
+  
+
+  $ hg obslog 7a230b46bf61 --patch -f --no-origin
   o  7a230b46bf61 (2) A2
   |
   @  471f378eab4c (1) A0
@@ -156,19 +193,33 @@
          +A2
   
   
+  $ hg obslog 7a230b46bf61 --patch -f
+  o  7a230b46bf61 (2) A2
+  |    reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r 471f378eab4c -r 7a230b46bf61 changeset-description
+  |      --- a/changeset-description
+  |      +++ b/changeset-description
+  |      @@ -1,1 +1,1 @@
+  |      -A0
+  |      +A2
+  |
+  |
+  @  471f378eab4c (1) A0
+  
+
   $ hg obslog 7a230b46bf61 --color=debug --patch
   o  [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
+  |    [evolve.verb|reworded](description) from [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+  |      (No patch available, predecessor is unknown locally)
   |
   x  [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
-  |    [evolve.verb|reworded](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+  |    [evolve.verb|reworded](description) from [evolve.node|471f378eab4c] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
   |      (No patch available, context is not local)
   |
   @  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
-       [evolve.verb|reworded](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
-         (No patch available, successor is unknown locally)
   
 
-  $ hg obslog 7a230b46bf61 --graph \
+  $ hg obslog 7a230b46bf61 --graph --no-origin \
   > -T '{node|short} {rev} {desc|firstline}\n{markers % "rewritten using {operations}"}\n'
   o  7a230b46bf61 2 A2
   |
@@ -177,6 +228,15 @@
   @  471f378eab4c 1 A0
      rewritten using amend
 
+  $ hg obslog 7a230b46bf61 --graph \
+  > -T '{node|short} {rev} {desc|firstline}\n{markers % "rewritten using {operations}"}\n'
+  o  7a230b46bf61 2 A2
+  |  rewritten using amend
+  x  fdf9bde5129a
+  |  rewritten using amend
+  @  471f378eab4c 1 A0
+  
+
 Test output with non-local changesets and various templates
 ===========================================================
 
@@ -200,7 +260,7 @@
 
   $ hg strip 'desc(A1) + desc(A2)' --hidden --quiet --config extensions.strip=
 
-  $ hg obslog -f
+  $ hg obslog -f --no-origin
   @  41985e02b792 (1) A3
   |
   x  6ffd04c870fe (0) A0
@@ -209,14 +269,35 @@
          note: note2
          note: note3
   
-  $ hg obslog -f -T fancy
+  $ hg obslog -f
+  @  41985e02b792 (1) A3
+  |    rewritten(description, date) from 6ffd04c870fe using amend, metaedit by alice, bob, test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000)
+  |      note: note1
+  |      note: note2
+  |      note: note3
+  |
+  x  6ffd04c870fe (0) A0
+  
+  $ hg obslog -f -T fancy --no-origin
   @  A3
   |
   x  A0
      rewritten using amend, metaedit by alice, bob, test (note1; note2; note3)
 
-  $ hg obslog -f -T fancier
+  $ hg obslog -f -T fancy
+  @  A3
+  |  rewritten using amend, metaedit by alice, bob, test (note1; note2; note3)
+  x  A0
+  
+
+  $ hg obslog -f -T fancier --no-origin
   @  A3
   |
   x  A0
      alice, bob, test had rewritten this commit using amend/metaedit and said: "note1", "note2", "note3")
+
+  $ hg obslog -f -T fancier
+  @  A3
+  |  alice, bob, test had rewritten this commit using amend/metaedit and said: "note1", "note2", "note3")
+  x  A0
+