##// END OF EJS Templates
Merge with crew-stable
Merge with crew-stable

File last commit:

r9402:5d49fdef default
r9404:4483af16 merge default
Show More
test-hgweb-diffs.out
418 lines | 10.8 KiB | text/plain | TextLexer
/ tests / test-hgweb-diffs.out
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 % setting up repo
adding a
adding b
% change permissions for git diffs
% set up hgweb
% revision
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!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">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
Matt Mackall
hgweb: update tests for paper style...
r7339 <title>test: 0cd96de13884</title>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </head>
<body>
Matt Mackall
hgweb: update tests for paper style...
r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </div>
Matt Mackall
hgweb: update tests for paper style...
r7339 <ul>
<li><a href="/shortlog/0cd96de13884">log</a></li>
<li><a href="/graph/0cd96de13884">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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>
Dirkjan Ochtman
coal/paper: show branch name in changeset view
r7410 <h3>changeset 0:0cd96de13884 </h3>
Matt Mackall
hgweb: update tests for paper style...
r7339
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <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>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
r7544 <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
Matt Mackall
hgweb: update tests for paper style...
r7339 <tr>
<th class="author">parents</th>
<td class="author"></td>
</tr>
<tr>
<th class="author">children</th>
Stepan Koltsov
coal/paper: add missing spaces in changeset child formatting
r7668 <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <div class="sourcefirst"> line diff</div>
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 <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
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 </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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </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
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 </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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
</body>
</html>
Dirkjan Ochtman
hgweb: show diff header line in raw diffs
r9402 % raw revision
200 Script output follows
# HG changeset patch
# User test
# Date 0 0
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
a
diff -r 000000000000 -r 0cd96de13884 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r 000000000000 -r 0cd96de13884 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 % diff removed file
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!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">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
<title>test: a diff</title>
</head>
<body>
Matt Mackall
hgweb: update tests for paper style...
r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </div>
Matt Mackall
hgweb: update tests for paper style...
r7339 <ul>
<li><a href="/shortlog/78e4ebad7cdf">log</a></li>
<li><a href="/graph/78e4ebad7cdf">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <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>
Matt Mackall
hgweb: update tests for paper style...
r7339 </form>
<div class="description">b</div>
<table id="changesetEntry">
<tr>
<th>author</th>
<td>&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th>date</th>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
r7544 <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
Matt Mackall
hgweb: update tests for paper style...
r7339 </tr>
<tr>
<th>parents</th>
<td></td>
</tr>
<tr>
<th>children</th>
<td></td>
</tr>
</table>
<div class="overflow">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <div class="sourcefirst"> line diff</div>
Matt Mackall
hgweb: update tests for paper style...
r7339
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 <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
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 </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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
</body>
</html>
% set up hgweb with git diffs
% revision
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!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">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
Matt Mackall
hgweb: update tests for paper style...
r7339 <title>test: 0cd96de13884</title>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </head>
<body>
Matt Mackall
hgweb: update tests for paper style...
r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </div>
Matt Mackall
hgweb: update tests for paper style...
r7339 <ul>
<li><a href="/shortlog/0cd96de13884">log</a></li>
<li><a href="/graph/0cd96de13884">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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>
Dirkjan Ochtman
coal/paper: show branch name in changeset view
r7410 <h3>changeset 0:0cd96de13884 </h3>
Matt Mackall
hgweb: update tests for paper style...
r7339
<form class="search" action="/log">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <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>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
r7544 <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
Matt Mackall
hgweb: update tests for paper style...
r7339 <tr>
<th class="author">parents</th>
<td class="author"></td>
</tr>
<tr>
<th class="author">children</th>
Stepan Koltsov
coal/paper: add missing spaces in changeset child formatting
r7668 <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <div class="sourcefirst"> line diff</div>
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
</body>
</html>
Dirkjan Ochtman
hgweb: show diff header line in raw diffs
r9402 % revision
200 Script output follows
# HG changeset patch
# User test
# Date 0 0
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
a
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+a
diff --git a/b b/b
new file mode 100644
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+b
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 % diff removed file
200 Script output follows
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <!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">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <head>
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <link rel="icon" href="/static/hgicon.png" type="image/png" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <meta name="robots" content="index, nofollow" />
Matt Mackall
hgweb: update tests for paper style...
r7339 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
<title>test: a diff</title>
</head>
<body>
Matt Mackall
hgweb: update tests for paper style...
r7339 <div class="container">
<div class="menu">
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 <div class="logo">
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 <a href="http://mercurial.selenic.com/">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <img src="/static/hglogo.png" alt="mercurial" /></a>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309 </div>
Matt Mackall
hgweb: update tests for paper style...
r7339 <ul>
<li><a href="/shortlog/78e4ebad7cdf">log</a></li>
<li><a href="/graph/78e4ebad7cdf">graph</a></li>
<li><a href="/tags">tags</a></li>
Sune Foldager
paper/coal: add branches page
r8353 <li><a href="/branches">branches</a></li>
Matt Mackall
hgweb: update tests for paper style...
r7339 </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">
Benoit Allard
coal/paper: switch to XHTML 1.1
r7725 <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>
Matt Mackall
hgweb: update tests for paper style...
r7339 </form>
<div class="description">b</div>
<table id="changesetEntry">
<tr>
<th>author</th>
<td>&#116;&#101;&#115;&#116;</td>
</tr>
<tr>
<th>date</th>
Gilles Moris
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py...
r7544 <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
Matt Mackall
hgweb: update tests for paper style...
r7339 </tr>
<tr>
<th>parents</th>
<td></td>
</tr>
<tr>
<th>children</th>
<td></td>
</tr>
</table>
<div class="overflow">
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <div class="sourcefirst"> line diff</div>
Matt Mackall
hgweb: update tests for paper style...
r7339
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755
Dirkjan Ochtman
tests: fix tests broken by 03b60f2f90bf
r7395 <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
Rocco Rutte
coal/paper: Wrap diff in <pre/>...
r8369 </span></pre></div>
Matt Mackall
hgweb: update tests for paper style...
r7339 </div>
</div>
</div>
Dirkjan Ochtman
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
r7309
</body>
</html>
% errors