test-hgweb-diffs.out
429 lines
| 11.2 KiB
| text/plain
|
TextLexer
/ tests / test-hgweb-diffs.out
Dirkjan Ochtman
|
r7309 | % setting up repo | ||
adding a | ||||
adding b | ||||
% change permissions for git diffs | ||||
% set up hgweb | ||||
% revision | ||||
200 Script output follows | ||||
Benoit Allard
|
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
|
r7309 | <head> | ||
Benoit Allard
|
r7725 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | ||
Dirkjan Ochtman
|
r7309 | <meta name="robots" content="index, nofollow" /> | ||
Matt Mackall
|
r7339 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | ||
Dirkjan Ochtman
|
r7309 | |||
Matt Mackall
|
r7339 | <title>test: 0cd96de13884</title> | ||
Dirkjan Ochtman
|
r7309 | </head> | ||
<body> | ||||
Matt Mackall
|
r7339 | <div class="container"> | ||
<div class="menu"> | ||||
Dirkjan Ochtman
|
r7309 | <div class="logo"> | ||
Dirkjan Ochtman
|
r8936 | <a href="http://mercurial.selenic.com/"> | ||
Benoit Allard
|
r7725 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
Dirkjan Ochtman
|
r7309 | </div> | ||
Matt Mackall
|
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
|
r8353 | <li><a href="/branches">branches</a></li> | ||
Matt Mackall
|
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
|
r7410 | <h3>changeset 0:0cd96de13884 </h3> | ||
Matt Mackall
|
r7339 | |||
<form class="search" action="/log"> | ||||
Benoit Allard
|
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
|
r7339 | </form> | ||
<div class="description">a</div> | ||||
<table id="changesetEntry"> | ||||
<tr> | ||||
<th class="author">author</th> | ||||
<td class="author">test</td> | ||||
</tr> | ||||
<tr> | ||||
<th class="date">date</th> | ||||
Dirkjan Ochtman
|
r9722 | <td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> | ||
Matt Mackall
|
r7339 | <tr> | ||
<th class="author">parents</th> | ||||
<td class="author"></td> | ||||
</tr> | ||||
<tr> | ||||
<th class="author">children</th> | ||||
Stepan Koltsov
|
r7668 | <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> | ||
Matt Mackall
|
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
|
r7395 | <div class="sourcefirst"> line diff</div> | ||
Rocco Rutte
|
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
|
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
|
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
|
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
|
r8369 | </span></pre></div> | ||
Matt Mackall
|
r7339 | </div> | ||
</div> | ||||
</div> | ||||
Dirkjan Ochtman
|
r7309 | |||
</body> | ||||
</html> | ||||
Dirkjan Ochtman
|
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
|
r7309 | % diff removed file | ||
200 Script output follows | ||||
Benoit Allard
|
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
|
r7309 | <head> | ||
Benoit Allard
|
r7725 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | ||
Dirkjan Ochtman
|
r7309 | <meta name="robots" content="index, nofollow" /> | ||
Matt Mackall
|
r7339 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | ||
Dirkjan Ochtman
|
r7309 | |||
<title>test: a diff</title> | ||||
</head> | ||||
<body> | ||||
Matt Mackall
|
r7339 | <div class="container"> | ||
<div class="menu"> | ||||
Dirkjan Ochtman
|
r7309 | <div class="logo"> | ||
Dirkjan Ochtman
|
r8936 | <a href="http://mercurial.selenic.com/"> | ||
Benoit Allard
|
r7725 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
Dirkjan Ochtman
|
r7309 | </div> | ||
Matt Mackall
|
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
|
r8353 | <li><a href="/branches">branches</a></li> | ||
Matt Mackall
|
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> | ||||
Dirkjan Ochtman
|
r9720 | <li><a href="/file/tip/a">latest</a></li> | ||
Matt Mackall
|
r7339 | <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
|
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
|
r7339 | </form> | ||
<div class="description">b</div> | ||||
<table id="changesetEntry"> | ||||
<tr> | ||||
<th>author</th> | ||||
<td>test</td> | ||||
</tr> | ||||
<tr> | ||||
<th>date</th> | ||||
Dirkjan Ochtman
|
r9722 | <td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> | ||
Matt Mackall
|
r7339 | </tr> | ||
<tr> | ||||
<th>parents</th> | ||||
<td></td> | ||||
</tr> | ||||
<tr> | ||||
<th>children</th> | ||||
<td></td> | ||||
</tr> | ||||
</table> | ||||
<div class="overflow"> | ||||
Dirkjan Ochtman
|
r7395 | <div class="sourcefirst"> line diff</div> | ||
Matt Mackall
|
r7339 | |||
Rocco Rutte
|
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
|
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
|
r8369 | </span></pre></div> | ||
Matt Mackall
|
r7339 | </div> | ||
</div> | ||||
</div> | ||||
Dirkjan Ochtman
|
r7309 | |||
</body> | ||||
</html> | ||||
% set up hgweb with git diffs | ||||
% revision | ||||
200 Script output follows | ||||
Benoit Allard
|
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
|
r7309 | <head> | ||
Benoit Allard
|
r7725 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | ||
Dirkjan Ochtman
|
r7309 | <meta name="robots" content="index, nofollow" /> | ||
Matt Mackall
|
r7339 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | ||
Dirkjan Ochtman
|
r7309 | |||
Matt Mackall
|
r7339 | <title>test: 0cd96de13884</title> | ||
Dirkjan Ochtman
|
r7309 | </head> | ||
<body> | ||||
Matt Mackall
|
r7339 | <div class="container"> | ||
<div class="menu"> | ||||
Dirkjan Ochtman
|
r7309 | <div class="logo"> | ||
Dirkjan Ochtman
|
r8936 | <a href="http://mercurial.selenic.com/"> | ||
Benoit Allard
|
r7725 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
Dirkjan Ochtman
|
r7309 | </div> | ||
Matt Mackall
|
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
|
r8353 | <li><a href="/branches">branches</a></li> | ||
Matt Mackall
|
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
|
r7410 | <h3>changeset 0:0cd96de13884 </h3> | ||
Matt Mackall
|
r7339 | |||
<form class="search" action="/log"> | ||||
Benoit Allard
|
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
|
r7339 | </form> | ||
<div class="description">a</div> | ||||
<table id="changesetEntry"> | ||||
<tr> | ||||
<th class="author">author</th> | ||||
<td class="author">test</td> | ||||
</tr> | ||||
<tr> | ||||
<th class="date">date</th> | ||||
Dirkjan Ochtman
|
r9722 | <td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> | ||
Matt Mackall
|
r7339 | <tr> | ||
<th class="author">parents</th> | ||||
<td class="author"></td> | ||||
</tr> | ||||
<tr> | ||||
<th class="author">children</th> | ||||
Stepan Koltsov
|
r7668 | <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> | ||
Matt Mackall
|
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
|
r7395 | <div class="sourcefirst"> line diff</div> | ||
Rocco Rutte
|
r8369 | <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644 | ||
Dirkjan Ochtman
|
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
|
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
|
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
|
r8369 | </span></pre></div> | ||
Matt Mackall
|
r7339 | </div> | ||
</div> | ||||
</div> | ||||
Dirkjan Ochtman
|
r7309 | |||
</body> | ||||
</html> | ||||
Dirkjan Ochtman
|
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
|
r7309 | % diff removed file | ||
200 Script output follows | ||||
Benoit Allard
|
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
|
r7309 | <head> | ||
Benoit Allard
|
r7725 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | ||
Dirkjan Ochtman
|
r7309 | <meta name="robots" content="index, nofollow" /> | ||
Matt Mackall
|
r7339 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | ||
Dirkjan Ochtman
|
r7309 | |||
<title>test: a diff</title> | ||||
</head> | ||||
<body> | ||||
Matt Mackall
|
r7339 | <div class="container"> | ||
<div class="menu"> | ||||
Dirkjan Ochtman
|
r7309 | <div class="logo"> | ||
Dirkjan Ochtman
|
r8936 | <a href="http://mercurial.selenic.com/"> | ||
Benoit Allard
|
r7725 | <img src="/static/hglogo.png" alt="mercurial" /></a> | ||
Dirkjan Ochtman
|
r7309 | </div> | ||
Matt Mackall
|
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
|
r8353 | <li><a href="/branches">branches</a></li> | ||
Matt Mackall
|
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> | ||||
Dirkjan Ochtman
|
r9720 | <li><a href="/file/tip/a">latest</a></li> | ||
Matt Mackall
|
r7339 | <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
|
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
|
r7339 | </form> | ||
<div class="description">b</div> | ||||
<table id="changesetEntry"> | ||||
<tr> | ||||
<th>author</th> | ||||
<td>test</td> | ||||
</tr> | ||||
<tr> | ||||
<th>date</th> | ||||
Dirkjan Ochtman
|
r9722 | <td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> | ||
Matt Mackall
|
r7339 | </tr> | ||
<tr> | ||||
<th>parents</th> | ||||
<td></td> | ||||
</tr> | ||||
<tr> | ||||
<th>children</th> | ||||
<td></td> | ||||
</tr> | ||||
</table> | ||||
<div class="overflow"> | ||||
Dirkjan Ochtman
|
r7395 | <div class="sourcefirst"> line diff</div> | ||
Matt Mackall
|
r7339 | |||
Rocco Rutte
|
r8369 | <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755 | ||
Dirkjan Ochtman
|
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
|
r8369 | </span></pre></div> | ||
Matt Mackall
|
r7339 | </div> | ||
</div> | ||||
</div> | ||||
Dirkjan Ochtman
|
r7309 | |||
</body> | ||||
</html> | ||||
Dirkjan Ochtman
|
r9731 | % test import rev as raw-rev | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 2 changes to 2 files | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
applying http://localhost:20059/rev/1 | ||||
Dirkjan Ochtman
|
r7309 | % errors | ||