Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: add newline after all markers in non-graphlog to match graphlog
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 07 Nov 2019 23:15:29 -0800
changeset 4948 069cfc5301fb
parent 4947 0ad2000854c4
child 4949 eb9bcef7cc5f
obslog: add newline after all markers in non-graphlog to match graphlog I'd also be fine with doing the reverse if that's preferred, but I really want them to be the same so they can use the same template.
hgext3rd/evolve/obshistory.py file | annotate | diff | comparison | revisions
tests/test-evolve-obshistory-amend.t file | annotate | diff | comparison | revisions
tests/test-evolve-obshistory-split.t file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/obshistory.py	Thu Nov 07 22:24:50 2019 -0800
+++ b/hgext3rd/evolve/obshistory.py	Thu Nov 07 23:15:29 2019 -0800
@@ -457,6 +457,7 @@
             includediff = opts and opts.get("patch")
             _debugobshistorydisplaymarker(ui, markerfm, successor, ctxnode, unfi, includediff)
         markerfm.end()
+        fm.plain(b'\n')
 
         precs = precursors.get(ctxnode, ())
         for p in sorted(precs):
--- a/tests/test-evolve-obshistory-amend.t	Thu Nov 07 22:24:50 2019 -0800
+++ b/tests/test-evolve-obshistory-amend.t	Thu Nov 07 23:15:29 2019 -0800
@@ -92,6 +92,7 @@
 
   $ hg obslog --no-graph --patch 4ae3a4151de9
   4ae3a4151de9 (2) A1
+  
   471f378eab4c (1) A0
     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
@@ -110,6 +111,7 @@
        A0
       +42
       
+  
 
 Test that content diff works with templating
   $ hg obslog --color=debug --patch 4ae3a4151de9 \
@@ -240,15 +242,19 @@
   
   $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
   4ae3a4151de9 (1) A1
+  
   471f378eab4c
     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
 
   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
   4ae3a4151de9 (1) A1
+  
   471f378eab4c
     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
 
 Amend two more times
 ====================
@@ -447,24 +453,32 @@
   
   $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
   92210308515b (2) A3
+  
   4f1685185907
     rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
   4ae3a4151de9 (1) A1
     rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, successor is unknown locally)
+  
   471f378eab4c
     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
 
   $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
   92210308515b (2) A3
+  
   4f1685185907
     rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
   4ae3a4151de9 (1) A1
     rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, successor is unknown locally)
+  
   471f378eab4c
     rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
       (No patch available, context is not local)
+  
--- a/tests/test-evolve-obshistory-split.t	Thu Nov 07 22:24:50 2019 -0800
+++ b/tests/test-evolve-obshistory-split.t	Thu Nov 07 23:15:29 2019 -0800
@@ -244,14 +244,18 @@
   
   $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip
   f257fde29c7a (2) A0
+  
   471597cad322
     rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
       note: testing split
       (No patch available, context is not local)
+  
 
   $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip
   f257fde29c7a (2) A0
+  
   471597cad322
     rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
       note: testing split
       (No patch available, context is not local)
+
evolve