Mercurial > evolve
diff tests/test-evolve-obshistory-amend.t @ 4952:b135591bec1a
obslog: make {patch} not be indented and leave that to the template
This removes some unwanted indentation from the tests. In the first
case, it's because indent() doesn't indent a blank line. In the second
case, it's because we used templating with {patch} and had not
requested indentation (but we still got it before this patch).
Note that tests will only pass with a very recent Mercurial (one with
https://phab.mercurial-scm.org/D7432 applied).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 15 Nov 2019 09:53:42 -0800 |
parents | 7bfd3fed5d1f |
children | 5c41bb482867 a76ed637acba |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend.t Thu Nov 07 13:40:53 2019 -0800 +++ b/tests/test-evolve-obshistory-amend.t Fri Nov 15 09:53:42 2019 -0800 @@ -110,7 +110,7 @@ @@ -1,1 +1,2 @@ A0 +42 - + Test that content diff works with templating @@ -121,13 +121,13 @@ x 471f378eab4c A0 patch: ``` - [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0] - [diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000] - [diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000] - [diff.hunk|@@ -1,1 +1,2 @@] - A0 - [diff.inserted|+42] - ``` + [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0] + [diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000] + [diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000] + [diff.hunk|@@ -1,1 +1,2 @@] + A0 + [diff.inserted|+42] + ``` $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' @ A1