diff tests/test-evolve-obshistory-amend.t @ 6074:55e9987b8384 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

# no-check-commit

--- a/tests/test-evolve-obshistory-amend.t	Tue Oct 12 13:46:30 2021 +0300
+++ b/tests/test-evolve-obshistory-amend.t	Tue Oct 12 14:04:23 2021 +0300
@@ -5,12 +5,6 @@
 
   $ . $TESTDIR/testlib/obshistory_setup.sh
 
-  $ cat >> $HGRCPATH << EOF
-  > [templates]
-  > logdates = '{ifeq(min(dates), max(dates), "at {max(dates)|hgdate}", "between {min(dates)|hgdate} and {max(dates)|hgdate}")}'
-  > logmarkers = '{if(markers, join(markers % "{logdates} by {users} "))}'
-  > EOF
-
 Test output on amended commit
 =============================
 
@@ -133,24 +127,24 @@
   x  471f378eab4c A0
   
 
-  $ hg obslog 4ae3a4151de9 --graph --no-origin -T '{desc|firstline} {logmarkers}'
+  $ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
   @  A1
   |
   x  A0 at 0 0 by test
   
-  $ hg obslog 4ae3a4151de9 --graph -T '{desc|firstline} {logmarkers}'
+  $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
   @  A1 at 0 0 by test
   |
   x  A0
   
 
 Check that the same thing works with the old {shortdescription} form
-  $ hg obslog 4ae3a4151de9 --graph --no-origin -T '{shortdescription} {logmarkers}'
+  $ hg obslog 4ae3a4151de9 --graph --no-origin -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
   @  A1
   |
   x  A0 at 0 0 by test
   
-  $ hg obslog 4ae3a4151de9 --graph -T '{shortdescription} {logmarkers}'
+  $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {users} ", " also "))}'
   @  A1 at 0 0 by test
   |
   x  A0