upstream/mercurial-mirror Commit - r8369:93a811ef

coal/paper: Wrap diff in <pre/>...

Rocco Rutte -

r8369:93a811ef default

parent child

templates/coal/map

0 +1 -1

             annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td><td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td></tr>'
-            diffblock = '<div class="source bottomline parity{parity}">{lines}</div>'
+            diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
             difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
             difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
             difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'

templates/paper/map

0 +1 -1

             annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td><td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td></tr>'
-            diffblock = '<div class="source bottomline parity{parity}">{lines}</div>'
+            diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
             difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
             difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
             difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'

tests/test-hgweb-commands.out

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

tests/test-hgweb-diffs.out

0 +10 -10

             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
-            </span></div><div class="source bottomline parity1"><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+            </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="plusline">+b
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             </div>
             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100644
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100644
             <a href="#l1.2" id="l1.2">     1.2</a> <span class="minusline">--- /dev/null
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="plusline">+++ b/a
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l1.5" id="l1.5">     1.5</a> <span class="plusline">+a
-            </span></div><div class="source bottomline parity1"><a href="#l2.1" id="l2.1">     2.1</a> new file mode 100644
+            </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> new file mode 100644
             <a href="#l2.2" id="l2.2">     2.2</a> <span class="minusline">--- /dev/null
             </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="plusline">+++ b/b
             </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l2.5" id="l2.5">     2.5</a> <span class="plusline">+b
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100755
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100755
             <a href="#l1.2" id="l1.2">     1.2</a> <span class="minusline">--- /dev/null
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="plusline">+++ b/a
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="atline">@@ -0,0 +1,1 @@
             </span><a href="#l1.5" id="l1.5">     1.5</a> <span class="plusline">+a
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             </div>

tests/test-hgweb-removed.out

0 +4 -4

             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             <div class="overflow">
             <div class="sourcefirst">   line diff</div>
-            <div class="source bottomline parity0"><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
+            <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- a/a	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
             </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -1,1 +0,0 @@
             </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="minusline">-a
-            </span></div>
+            </span></pre></div>
             </div>
             </div>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages