coal/paper: Wrap diff in <pre/>

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

templates/coal/map

@@ -1,76 +1,76 b''
 default = 'shortlog'
 
 mimetype = 'text/html; charset={encoding}'
 header = header.tmpl
 footer = ../paper/footer.tmpl
 search = ../paper/search.tmpl
 
 changelog = ../paper/shortlog.tmpl
 shortlog = ../paper/shortlog.tmpl
 shortlogentry = ../paper/shortlogentry.tmpl
 graph = ../paper/graph.tmpl
 
 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
 filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 filenolink = '{file|escape} '
 fileellipses = '...'
 changelogentry = ../paper/shortlogentry.tmpl
 searchentry = ../paper/shortlogentry.tmpl
 changeset = ../paper/changeset.tmpl
 manifest = ../paper/manifest.tmpl
 
 direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
 fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
 
 filerevision = ../paper/filerevision.tmpl
 fileannotate = ../paper/fileannotate.tmpl
 filediff = ../paper/filediff.tmpl
 filelog = ../paper/filelog.tmpl
 fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
 filelogentry = ../paper/filelogentry.tmpl
 
 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>'
 diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
 
 changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 
 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerename = '{file|escape}@'
 filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
 fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
 changesetchild = ' <a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
 changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 tags = ../paper/tags.tmpl
 tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
 branches = ../paper/branches.tmpl
 branchentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{branch|escape}</a></td><td class="node">{node|short}</td></tr>'
 changelogtag = '<span class="tag">{name|escape}</span> '
 changesettag = '<span class="tag">{tag|escape}</span> '
 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
 changelogbranchname = '<span class="branchname">{name|escape}</span> ' 
 filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td></tr>\n'
 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
 index = ../paper/index.tmpl
 archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
 notfound = ../paper/notfound.tmpl
 error = ../paper/error.tmpl
 urlparameter = '{separator}{name}={value|urlescape}'
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'

templates/paper/map

@@ -1,76 +1,76 b''
 default = 'shortlog'
 
 mimetype = 'text/html; charset={encoding}'
 header = header.tmpl
 footer = footer.tmpl
 search = search.tmpl
 
 changelog = shortlog.tmpl
 shortlog = shortlog.tmpl
 shortlogentry = shortlogentry.tmpl
 graph = graph.tmpl
 
 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
 filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 filenolink = '{file|escape} '
 fileellipses = '...'
 changelogentry = shortlogentry.tmpl
 searchentry = shortlogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
 
 direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png" alt="dir."/> {basename|escape}/</a> <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a></td><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
 fileentry = '<tr class="fileline parity{parity}"><td class="filename"><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png" alt="file"/> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
 
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
 fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
 filelogentry = filelogentry.tmpl
 
 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>'
 diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
 
 changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 
 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerename = '{file|escape}@'
 filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
 fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
 changesetchild = ' <a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
 changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 tags = tags.tmpl
 tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
 branches = branches.tmpl
 branchentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{branch|escape}</a></td><td class="node">{node|short}</td></tr>'
 changelogtag = '<span class="tag">{name|escape}</span> '
 changesettag = '<span class="tag">{tag|escape}</span> '
 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
 changelogbranchname = '<span class="branchname">{name|escape}</span> ' 
 filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks">{archives%indexarchiveentry}</td></tr>\n'
 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">&nbsp;&darr;{type|escape}</a>'
 index = index.tmpl
 archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
 notfound = notfound.tmpl
 error = error.tmpl
 urlparameter = '{separator}{name}={value|urlescape}'
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'

tests/test-hgweb-diffs.out

@@ -1,372 +1,372 b''
 % setting up repo
 adding a
 adding b
 % change permissions for git diffs
 % set up hgweb
 % revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: 0cd96de13884</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/0cd96de13884">log</a></li>
  <li><a href="/graph/0cd96de13884">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/0cd96de13884">raw</a></li>
  <li><a href="/file/0cd96de13884">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">a</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
 </tr>
 </table>
 
 <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>
 
 
 </body>
 </html>
 
 % diff removed file
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
 <li><a href="/graph/78e4ebad7cdf">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/78e4ebad7cdf">changeset</a></li>
 <li><a href="/file/78e4ebad7cdf">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/78e4ebad7cdf/a">file</a></li>
 <li class="active">diff</li>
 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
 <li><a href="/log/78e4ebad7cdf/a">file log</a></li>
 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>diff a @ 1:78e4ebad7cdf</h3>
 
 <form class="search" action="/log">
 <p></p>
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">b</div>
 
 <table id="changesetEntry">
 <tr>
  <th>author</th>
  <td>&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th>date</th>
  <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th>parents</th>
  <td></td>
 </tr>
 <tr>
  <th>children</th>
  <td></td>
 </tr>
 
 </table>
 
 <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>
 
 
 
 </body>
 </html>
 
 % set up hgweb with git diffs
 % revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: 0cd96de13884</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/0cd96de13884">log</a></li>
  <li><a href="/graph/0cd96de13884">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/0cd96de13884">raw</a></li>
  <li><a href="/file/0cd96de13884">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">a</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
 </tr>
 </table>
 
 <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>
 
 
 </body>
 </html>
 
 % diff removed file
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
 <li><a href="/graph/78e4ebad7cdf">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/78e4ebad7cdf">changeset</a></li>
 <li><a href="/file/78e4ebad7cdf">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/78e4ebad7cdf/a">file</a></li>
 <li class="active">diff</li>
 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
 <li><a href="/log/78e4ebad7cdf/a">file log</a></li>
 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>diff a @ 1:78e4ebad7cdf</h3>
 
 <form class="search" action="/log">
 <p></p>
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">b</div>
 
 <table id="changesetEntry">
 <tr>
  <th>author</th>
  <td>&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th>date</th>
  <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th>parents</th>
  <td></td>
 </tr>
 <tr>
  <th>children</th>
  <td></td>
 </tr>
 
 </table>
 
 <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>
 
 
 
 </body>
 </html>
 
 % errors

tests/test-hgweb-removed.out

@@ -1,180 +1,180 b''
 % setting up repo
 adding a
 % set up hgweb
 % revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: c78f6c5cbea9</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/c78f6c5cbea9">log</a></li>
  <li><a href="/graph/c78f6c5cbea9">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/c78f6c5cbea9">raw</a></li>
  <li><a href="/file/c78f6c5cbea9">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 1:c78f6c5cbea9  <span class="tag">tip</span> </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">del</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files">a </td>
 </tr>
 </table>
 
 <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>
 
 
 </body>
 </html>
 
 % diff removed file
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/c78f6c5cbea9">log</a></li>
 <li><a href="/graph/c78f6c5cbea9">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/c78f6c5cbea9">changeset</a></li>
 <li><a href="/file/c78f6c5cbea9">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/c78f6c5cbea9/a">file</a></li>
 <li class="active">diff</li>
 <li><a href="/annotate/c78f6c5cbea9/a">annotate</a></li>
 <li><a href="/log/c78f6c5cbea9/a">file log</a></li>
 <li><a href="/raw-file/c78f6c5cbea9/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>diff a @ 1:c78f6c5cbea9</h3>
 
 <form class="search" action="/log">
 <p></p>
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">del</div>
 
 <table id="changesetEntry">
 <tr>
  <th>author</th>
  <td>&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th>date</th>
  <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th>parents</th>
  <td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td>
 </tr>
 <tr>
  <th>children</th>
  <td></td>
 </tr>
 
 </table>
 
 <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>
 
 
 
 </body>
 </html>