# HG changeset patch # User Rocco Rutte # Date 1242225079 -7200 # Node ID 93a811ef3ac03d29db01cec3de6ba41261df734d # Parent 52e6117a9940787b4b67ec937ee2384896900f53 coal/paper: Wrap diff in 

In text-mode browsers the diff is otherwise rendered
as just one long line per file. Other styles do the same.

diff -r 52e6117a9940 -r 93a811ef3ac0 templates/coal/map
--- a/templates/coal/map	Tue May 12 01:08:28 2009 +0200
+++ b/templates/coal/map	Wed May 13 16:31:19 2009 +0200
@@ -35,7 +35,7 @@
 
 annotateline = '{author|user}@{rev}{linenumber} {line|escape}'
 
-diffblock = '
{lines}
'
+diffblock = '
{lines}
'
 difflineplus = '{linenumber} {line|escape}'
 difflineminus = '{linenumber} {line|escape}'
 difflineat = '{linenumber} {line|escape}'
diff -r 52e6117a9940 -r 93a811ef3ac0 templates/paper/map
--- a/templates/paper/map	Tue May 12 01:08:28 2009 +0200
+++ b/templates/paper/map	Wed May 13 16:31:19 2009 +0200
@@ -35,7 +35,7 @@
 
 annotateline = '{author|user}@{rev}{linenumber} {line|escape}'
 
-diffblock = '
{lines}
'
+diffblock = '
{lines}
'
 difflineplus = '{linenumber} {line|escape}'
 difflineminus = '{linenumber} {line|escape}'
 difflineat = '{linenumber} {line|escape}'
diff -r 52e6117a9940 -r 93a811ef3ac0 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed
diff -r 52e6117a9940 -r 93a811ef3ac0 tests/test-hgweb-diffs.out
--- a/tests/test-hgweb-diffs.out	Tue May 12 01:08:28 2009 +0200
+++ b/tests/test-hgweb-diffs.out	Wed May 13 16:31:19 2009 +0200
@@ -77,15 +77,15 @@
 

 
   line diff

 
-
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
      1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
      1.3 @@ -0,0 +1,1 @@
      1.4 +a
-
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
      2.2 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
      2.3 @@ -0,0 +1,1 @@
      2.4 +b
-
+ @@ -170,11 +170,11 @@
line diff
-
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
      1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
      1.3 @@ -0,0 +1,1 @@
      1.4 +a
-
+
@@ -259,17 +259,17 @@
line diff
-
1.1 new file mode 100644 +
     1.1 new file mode 100644
      1.2 --- /dev/null
      1.3 +++ b/a
      1.4 @@ -0,0 +1,1 @@
      1.5 +a
-
2.1 new file mode 100644 +
     2.1 new file mode 100644
      2.2 --- /dev/null
      2.3 +++ b/b
      2.4 @@ -0,0 +1,1 @@
      2.5 +b
-
+
@@ -354,12 +354,12 @@
line diff
-
1.1 new file mode 100755 +
     1.1 new file mode 100755
      1.2 --- /dev/null
      1.3 +++ b/a
      1.4 @@ -0,0 +1,1 @@
      1.5 +a
-
+
diff -r 52e6117a9940 -r 93a811ef3ac0 tests/test-hgweb-removed.out --- a/tests/test-hgweb-removed.out Tue May 12 01:08:28 2009 +0200 +++ b/tests/test-hgweb-removed.out Wed May 13 16:31:19 2009 +0200 @@ -75,11 +75,11 @@
line diff
-
1.1 --- a/a Thu Jan 01 00:00:00 1970 +0000 +
     1.1 --- a/a	Thu Jan 01 00:00:00 1970 +0000
      1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
      1.3 @@ -1,1 +0,0 @@
      1.4 -a
-
+
@@ -164,11 +164,11 @@
line diff
-
1.1 --- a/a Thu Jan 01 00:00:00 1970 +0000 +
     1.1 --- a/a	Thu Jan 01 00:00:00 1970 +0000
      1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
      1.3 @@ -1,1 +0,0 @@
      1.4 -a
-
+