##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

coal/paper: Wrap diff in <pre/>...
Rocco Rutte -
r8369:93a811ef default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 b' filelogentry = ../paper/filelogentry.tmp'
35 35
36 36 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>'
37 37
38 diffblock = '<div class="source bottomline parity{parity}">{lines}</div>'
38 diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
39 39 difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
40 40 difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
41 41 difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
Show file before | Show file after | Hide comments
@@ -35,7 +35,7 b' filelogentry = filelogentry.tmpl'
35 35
36 36 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>'
37 37
38 diffblock = '<div class="source bottomline parity{parity}">{lines}</div>'
38 diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>'
39 39 difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
40 40 difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
41 41 difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -77,15 +77,15 b' files, or words in the commit message</d'
77 77 <div class="overflow">
78 78 <div class="sourcefirst"> line diff</div>
79 79
80 <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
80 <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
81 81 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000
82 82 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@
83 83 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a
84 </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
84 </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
85 85 </span><a href="#l2.2" id="l2.2"> 2.2</a> <span class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000
86 86 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="atline">@@ -0,0 +1,1 @@
87 87 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="plusline">+b
88 </span></div>
88 </span></pre></div>
89 89 </div>
90 90
91 91 </div>
@@ -170,11 +170,11 b' files, or words in the commit message</d'
170 170 <div class="overflow">
171 171 <div class="sourcefirst"> line diff</div>
172 172
173 <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
173 <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
174 174 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000
175 175 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@
176 176 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a
177 </span></div>
177 </span></pre></div>
178 178 </div>
179 179 </div>
180 180 </div>
@@ -259,17 +259,17 b' files, or words in the commit message</d'
259 259 <div class="overflow">
260 260 <div class="sourcefirst"> line diff</div>
261 261
262 <div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644
262 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644
263 263 <a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null
264 264 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a
265 265 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@
266 266 </span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a
267 </span></div><div class="source bottomline parity1"><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644
267 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644
268 268 <a href="#l2.2" id="l2.2"> 2.2</a> <span class="minusline">--- /dev/null
269 269 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="plusline">+++ b/b
270 270 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="atline">@@ -0,0 +1,1 @@
271 271 </span><a href="#l2.5" id="l2.5"> 2.5</a> <span class="plusline">+b
272 </span></div>
272 </span></pre></div>
273 273 </div>
274 274
275 275 </div>
@@ -354,12 +354,12 b' files, or words in the commit message</d'
354 354 <div class="overflow">
355 355 <div class="sourcefirst"> line diff</div>
356 356
357 <div class="source bottomline parity0"><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755
357 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755
358 358 <a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null
359 359 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a
360 360 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@
361 361 </span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a
362 </span></div>
362 </span></pre></div>
363 363 </div>
364 364 </div>
365 365 </div>
Show file before | Show file after | Hide comments
@@ -75,11 +75,11 b' files, or words in the commit message</d'
75 75 <div class="overflow">
76 76 <div class="sourcefirst"> line diff</div>
77 77
78 <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
78 <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
79 79 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
80 80 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
81 81 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
82 </span></div>
82 </span></pre></div>
83 83 </div>
84 84
85 85 </div>
@@ -164,11 +164,11 b' files, or words in the commit message</d'
164 164 <div class="overflow">
165 165 <div class="sourcefirst"> line diff</div>
166 166
167 <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
167 <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
168 168 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
169 169 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -1,1 +0,0 @@
170 170 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="minusline">-a
171 </span></div>
171 </span></pre></div>
172 172 </div>
173 173 </div>
174 174 </div>
General Comments 0
You need to be logged in to leave comments. Login now