| author | Kevin Berridge <kevin.w.berridge@gmail.com> |
| Fri, 11 Mar 2011 20:43:12 -0500 | |
| changeset 13803 | e380964d53f8 |
| parent 13597 | 38c9837b1f75 |
| child 14046 | b24e5a708fad |
| permissions | -rw-r--r-- |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
1 |
setting up repo |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
2 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
3 |
$ hg init test |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
4 |
$ cd test |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
5 |
$ echo a > a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
6 |
$ echo b > b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
7 |
$ hg ci -Ama |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
8 |
adding a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
9 |
adding b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
10 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
11 |
change permissions for git diffs |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
12 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
13 |
$ chmod 755 a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
14 |
$ hg ci -Amb |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
15 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
16 |
set up hgweb |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
17 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
18 |
$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
19 |
$ cat hg.pid >> $DAEMON_PIDS |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
20 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
21 |
revision |
|
8452
cb93eee1fbcd
tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents:
7428
diff
changeset
|
22 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
23 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
24 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
25 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
26 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
27 |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
28 |
<head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
29 |
<link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
30 |
<meta name="robots" content="index, nofollow" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
31 |
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
32 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
33 |
<title>test: 0cd96de13884</title> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
34 |
</head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
35 |
<body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
36 |
<div class="container"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
37 |
<div class="menu"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
38 |
<div class="logo"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
39 |
<a href="http://mercurial.selenic.com/"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
40 |
<img src="/static/hglogo.png" alt="mercurial" /></a> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
41 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
42 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
43 |
<li><a href="/shortlog/0cd96de13884">log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
44 |
<li><a href="/graph/0cd96de13884">graph</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
45 |
<li><a href="/tags">tags</a></li> |
|
13597
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
46 |
<li><a href="/bookmarks">bookmarks</a></li> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
47 |
<li><a href="/branches">branches</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
48 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
49 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
50 |
<li class="active">changeset</li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
51 |
<li><a href="/raw-rev/0cd96de13884">raw</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
52 |
<li><a href="/file/0cd96de13884">browse</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
53 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
54 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
55 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
56 |
</ul> |
|
12666
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
57 |
<ul> |
|
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
58 |
<li><a href="/help">help</a></li> |
|
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
59 |
</ul> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
60 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
61 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
62 |
<div class="main"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
63 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
64 |
<h2><a href="/">test</a></h2> |
|
13596
270f57d35525
hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents:
12847
diff
changeset
|
65 |
<h3>changeset 0:0cd96de13884 </h3> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
66 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
67 |
<form class="search" action="/log"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
68 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
69 |
<p><input name="rev" id="search1" type="text" size="30" /></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
70 |
<div id="hint">find changesets by author, revision, |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
71 |
files, or words in the commit message</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
72 |
</form> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
73 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
74 |
<div class="description">a</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
75 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
76 |
<table id="changesetEntry"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
77 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
78 |
<th class="author">author</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
79 |
<td class="author">test</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
80 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
81 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
82 |
<th class="date">date</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
83 |
<td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
84 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
85 |
<th class="author">parents</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
86 |
<td class="author"></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
87 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
88 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
89 |
<th class="author">children</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
90 |
<td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
91 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
92 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
93 |
<th class="files">files</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
94 |
<td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
95 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
96 |
</table> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
97 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
98 |
<div class="overflow"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
99 |
<div class="sourcefirst"> line diff</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
100 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
101 |
<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 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
102 |
</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
103 |
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
104 |
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
105 |
</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 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
106 |
</span><a href="#l2.2" id="l2.2"> 2.2</a> <span class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
107 |
</span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
108 |
</span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="plusline">+b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
109 |
</span></pre></div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
110 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
111 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
112 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
113 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
114 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
115 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
116 |
</body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
117 |
</html> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
118 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
119 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
120 |
raw revision |
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
121 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
122 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
123 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
124 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
125 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
126 |
# HG changeset patch |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
127 |
# User test |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
128 |
# Date 0 0 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
129 |
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
130 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
131 |
a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
132 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
133 |
diff -r 000000000000 -r 0cd96de13884 a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
134 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
135 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
136 |
@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
137 |
+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
138 |
diff -r 000000000000 -r 0cd96de13884 b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
139 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
140 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
141 |
@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
142 |
+b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
143 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
144 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
145 |
diff removed file |
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
146 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
147 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
148 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
149 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
150 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
151 |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
152 |
<head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
153 |
<link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
154 |
<meta name="robots" content="index, nofollow" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
155 |
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
156 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
157 |
<title>test: a diff</title> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
158 |
</head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
159 |
<body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
160 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
161 |
<div class="container"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
162 |
<div class="menu"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
163 |
<div class="logo"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
164 |
<a href="http://mercurial.selenic.com/"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
165 |
<img src="/static/hglogo.png" alt="mercurial" /></a> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
166 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
167 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
168 |
<li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
169 |
<li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
170 |
<li><a href="/tags">tags</a></li> |
|
13597
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
171 |
<li><a href="/bookmarks">bookmarks</a></li> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
172 |
<li><a href="/branches">branches</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
173 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
174 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
175 |
<li><a href="/rev/78e4ebad7cdf">changeset</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
176 |
<li><a href="/file/78e4ebad7cdf">browse</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
177 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
178 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
179 |
<li><a href="/file/78e4ebad7cdf/a">file</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
180 |
<li><a href="/file/tip/a">latest</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
181 |
<li class="active">diff</li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
182 |
<li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
183 |
<li><a href="/log/78e4ebad7cdf/a">file log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
184 |
<li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
185 |
</ul> |
|
12680
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
186 |
<ul> |
|
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
187 |
<li><a href="/help">help</a></li> |
|
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
188 |
</ul> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
189 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
190 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
191 |
<div class="main"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
192 |
<h2><a href="/">test</a></h2> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
193 |
<h3>diff a @ 1:78e4ebad7cdf</h3> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
194 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
195 |
<form class="search" action="/log"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
196 |
<p></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
197 |
<p><input name="rev" id="search1" type="text" size="30" /></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
198 |
<div id="hint">find changesets by author, revision, |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
199 |
files, or words in the commit message</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
200 |
</form> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
201 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
202 |
<div class="description">b</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
203 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
204 |
<table id="changesetEntry"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
205 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
206 |
<th>author</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
207 |
<td>test</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
208 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
209 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
210 |
<th>date</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
211 |
<td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
212 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
213 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
214 |
<th>parents</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
215 |
<td></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
216 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
217 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
218 |
<th>children</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
219 |
<td></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
220 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
221 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
222 |
</table> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
223 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
224 |
<div class="overflow"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
225 |
<div class="sourcefirst"> line diff</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
226 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
227 |
<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 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
228 |
</span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
229 |
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
230 |
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
231 |
</span></pre></div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
232 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
233 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
234 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
235 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
236 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
237 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
238 |
</body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
239 |
</html> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
240 |
|
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
241 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
242 |
set up hgweb with git diffs |
|
9402
5d49fdef6fd0
hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8452
diff
changeset
|
243 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
244 |
$ "$TESTDIR/killdaemons.py" |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
245 |
$ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
246 |
$ cat hg.pid >> $DAEMON_PIDS |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
247 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
248 |
revision |
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
249 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
250 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
251 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
252 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
253 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
254 |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
255 |
<head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
256 |
<link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
257 |
<meta name="robots" content="index, nofollow" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
258 |
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
259 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
260 |
<title>test: 0cd96de13884</title> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
261 |
</head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
262 |
<body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
263 |
<div class="container"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
264 |
<div class="menu"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
265 |
<div class="logo"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
266 |
<a href="http://mercurial.selenic.com/"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
267 |
<img src="/static/hglogo.png" alt="mercurial" /></a> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
268 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
269 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
270 |
<li><a href="/shortlog/0cd96de13884">log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
271 |
<li><a href="/graph/0cd96de13884">graph</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
272 |
<li><a href="/tags">tags</a></li> |
|
13597
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
273 |
<li><a href="/bookmarks">bookmarks</a></li> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
274 |
<li><a href="/branches">branches</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
275 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
276 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
277 |
<li class="active">changeset</li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
278 |
<li><a href="/raw-rev/0cd96de13884">raw</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
279 |
<li><a href="/file/0cd96de13884">browse</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
280 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
281 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
282 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
283 |
</ul> |
|
12666
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
284 |
<ul> |
|
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
285 |
<li><a href="/help">help</a></li> |
|
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
12435
diff
changeset
|
286 |
</ul> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
287 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
288 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
289 |
<div class="main"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
290 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
291 |
<h2><a href="/">test</a></h2> |
|
13596
270f57d35525
hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents:
12847
diff
changeset
|
292 |
<h3>changeset 0:0cd96de13884 </h3> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
293 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
294 |
<form class="search" action="/log"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
295 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
296 |
<p><input name="rev" id="search1" type="text" size="30" /></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
297 |
<div id="hint">find changesets by author, revision, |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
298 |
files, or words in the commit message</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
299 |
</form> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
300 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
301 |
<div class="description">a</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
302 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
303 |
<table id="changesetEntry"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
304 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
305 |
<th class="author">author</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
306 |
<td class="author">test</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
307 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
308 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
309 |
<th class="date">date</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
310 |
<td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
311 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
312 |
<th class="author">parents</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
313 |
<td class="author"></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
314 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
315 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
316 |
<th class="author">children</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
317 |
<td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
318 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
319 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
320 |
<th class="files">files</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
321 |
<td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
322 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
323 |
</table> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
324 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
325 |
<div class="overflow"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
326 |
<div class="sourcefirst"> line diff</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
327 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
328 |
<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
329 |
<a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
330 |
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
331 |
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
332 |
</span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
333 |
</span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
334 |
<a href="#l2.2" id="l2.2"> 2.2</a> <span class="minusline">--- /dev/null |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
335 |
</span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="plusline">+++ b/b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
336 |
</span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
337 |
</span><a href="#l2.5" id="l2.5"> 2.5</a> <span class="plusline">+b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
338 |
</span></pre></div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
339 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
340 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
341 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
342 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
343 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
344 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
345 |
</body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
346 |
</html> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
347 |
|
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
348 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
349 |
revision |
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
350 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
351 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
352 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
353 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
354 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
355 |
# HG changeset patch |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
356 |
# User test |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
357 |
# Date 0 0 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
358 |
# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
359 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
360 |
a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
361 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
362 |
diff --git a/a b/a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
363 |
new file mode 100644 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
364 |
--- /dev/null |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
365 |
+++ b/a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
366 |
@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
367 |
+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
368 |
diff --git a/b b/b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
369 |
new file mode 100644 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
370 |
--- /dev/null |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
371 |
+++ b/b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
372 |
@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
373 |
+b |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
374 |
|
|
9402
5d49fdef6fd0
hgweb: show diff header line in raw diffs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8452
diff
changeset
|
375 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
376 |
diff removed file |
|
7309
e74a9173c2d7
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
377 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
378 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
379 |
200 Script output follows |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
380 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
381 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
382 |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
383 |
<head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
384 |
<link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
385 |
<meta name="robots" content="index, nofollow" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
386 |
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
387 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
388 |
<title>test: a diff</title> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
389 |
</head> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
390 |
<body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
391 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
392 |
<div class="container"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
393 |
<div class="menu"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
394 |
<div class="logo"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
395 |
<a href="http://mercurial.selenic.com/"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
396 |
<img src="/static/hglogo.png" alt="mercurial" /></a> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
397 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
398 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
399 |
<li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
400 |
<li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
401 |
<li><a href="/tags">tags</a></li> |
|
13597
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
402 |
<li><a href="/bookmarks">bookmarks</a></li> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
403 |
<li><a href="/branches">branches</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
404 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
405 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
406 |
<li><a href="/rev/78e4ebad7cdf">changeset</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
407 |
<li><a href="/file/78e4ebad7cdf">browse</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
408 |
</ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
409 |
<ul> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
410 |
<li><a href="/file/78e4ebad7cdf/a">file</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
411 |
<li><a href="/file/tip/a">latest</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
412 |
<li class="active">diff</li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
413 |
<li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
414 |
<li><a href="/log/78e4ebad7cdf/a">file log</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
415 |
<li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
416 |
</ul> |
|
12680
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
417 |
<ul> |
|
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
418 |
<li><a href="/help">help</a></li> |
|
d664547ef540
hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents:
12666
diff
changeset
|
419 |
</ul> |
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
420 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
421 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
422 |
<div class="main"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
423 |
<h2><a href="/">test</a></h2> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
424 |
<h3>diff a @ 1:78e4ebad7cdf</h3> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
425 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
426 |
<form class="search" action="/log"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
427 |
<p></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
428 |
<p><input name="rev" id="search1" type="text" size="30" /></p> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
429 |
<div id="hint">find changesets by author, revision, |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
430 |
files, or words in the commit message</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
431 |
</form> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
432 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
433 |
<div class="description">b</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
434 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
435 |
<table id="changesetEntry"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
436 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
437 |
<th>author</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
438 |
<td>test</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
439 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
440 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
441 |
<th>date</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
442 |
<td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
443 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
444 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
445 |
<th>parents</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
446 |
<td></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
447 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
448 |
<tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
449 |
<th>children</th> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
450 |
<td></td> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
451 |
</tr> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
452 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
453 |
</table> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
454 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
455 |
<div class="overflow"> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
456 |
<div class="sourcefirst"> line diff</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
457 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
458 |
<div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
459 |
<a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
460 |
</span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
461 |
</span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
462 |
</span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
463 |
</span></pre></div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
464 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
465 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
466 |
</div> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
467 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
468 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
469 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
470 |
</body> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
471 |
</html> |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
472 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
473 |
$ cd .. |
|
9731
0e080d519d1b
hgweb: treat rev as raw-rev if user agent is hg
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
9402
diff
changeset
|
474 |
|
|
12435
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
475 |
test import rev as raw-rev |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
476 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
477 |
$ hg clone -r0 test test1 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
478 |
adding changesets |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
479 |
adding manifests |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
480 |
adding file changes |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
481 |
added 1 changesets with 2 changes to 2 files |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
482 |
updating to branch default |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
483 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
484 |
$ cd test1 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
485 |
$ hg import -q --exact http://localhost:$HGPORT/rev/1 |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
486 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
487 |
errors |
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
488 |
|
|
61be1503cfb2
tests: unify test-hgweb-diffs
Matt Mackall <mpm@selenic.com>
parents:
9753
diff
changeset
|
489 |
$ cat ../test/errors.log |