1 % setting up repo |
|
2 adding a |
|
3 adding b |
|
4 % change permissions for git diffs |
|
5 % set up hgweb |
|
6 % revision |
|
7 200 Script output follows |
|
8 |
|
9 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
10 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
11 <head> |
|
12 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
13 <meta name="robots" content="index, nofollow" /> |
|
14 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
15 |
|
16 <title>test: 0cd96de13884</title> |
|
17 </head> |
|
18 <body> |
|
19 <div class="container"> |
|
20 <div class="menu"> |
|
21 <div class="logo"> |
|
22 <a href="http://mercurial.selenic.com/"> |
|
23 <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
24 </div> |
|
25 <ul> |
|
26 <li><a href="/shortlog/0cd96de13884">log</a></li> |
|
27 <li><a href="/graph/0cd96de13884">graph</a></li> |
|
28 <li><a href="/tags">tags</a></li> |
|
29 <li><a href="/branches">branches</a></li> |
|
30 </ul> |
|
31 <ul> |
|
32 <li class="active">changeset</li> |
|
33 <li><a href="/raw-rev/0cd96de13884">raw</a></li> |
|
34 <li><a href="/file/0cd96de13884">browse</a></li> |
|
35 </ul> |
|
36 <ul> |
|
37 |
|
38 </ul> |
|
39 </div> |
|
40 |
|
41 <div class="main"> |
|
42 |
|
43 <h2><a href="/">test</a></h2> |
|
44 <h3>changeset 0:0cd96de13884 </h3> |
|
45 |
|
46 <form class="search" action="/log"> |
|
47 |
|
48 <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
49 <div id="hint">find changesets by author, revision, |
|
50 files, or words in the commit message</div> |
|
51 </form> |
|
52 |
|
53 <div class="description">a</div> |
|
54 |
|
55 <table id="changesetEntry"> |
|
56 <tr> |
|
57 <th class="author">author</th> |
|
58 <td class="author">test</td> |
|
59 </tr> |
|
60 <tr> |
|
61 <th class="date">date</th> |
|
62 <td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> |
|
63 <tr> |
|
64 <th class="author">parents</th> |
|
65 <td class="author"></td> |
|
66 </tr> |
|
67 <tr> |
|
68 <th class="author">children</th> |
|
69 <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> |
|
70 </tr> |
|
71 <tr> |
|
72 <th class="files">files</th> |
|
73 <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td> |
|
74 </tr> |
|
75 </table> |
|
76 |
|
77 <div class="overflow"> |
|
78 <div class="sourcefirst"> line diff</div> |
|
79 |
|
80 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
81 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
82 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
83 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a |
|
84 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> <span class="minusline">--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
85 </span><a href="#l2.2" id="l2.2"> 2.2</a> <span class="plusline">+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
86 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
87 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="plusline">+b |
|
88 </span></pre></div> |
|
89 </div> |
|
90 |
|
91 </div> |
|
92 </div> |
|
93 |
|
94 |
|
95 </body> |
|
96 </html> |
|
97 |
|
98 % raw revision |
|
99 200 Script output follows |
|
100 |
|
101 |
|
102 # HG changeset patch |
|
103 # User test |
|
104 # Date 0 0 |
|
105 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e |
|
106 |
|
107 a |
|
108 |
|
109 diff -r 000000000000 -r 0cd96de13884 a |
|
110 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
111 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
112 @@ -0,0 +1,1 @@ |
|
113 +a |
|
114 diff -r 000000000000 -r 0cd96de13884 b |
|
115 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
116 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
117 @@ -0,0 +1,1 @@ |
|
118 +b |
|
119 |
|
120 % diff removed file |
|
121 200 Script output follows |
|
122 |
|
123 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
124 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
125 <head> |
|
126 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
127 <meta name="robots" content="index, nofollow" /> |
|
128 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
129 |
|
130 <title>test: a diff</title> |
|
131 </head> |
|
132 <body> |
|
133 |
|
134 <div class="container"> |
|
135 <div class="menu"> |
|
136 <div class="logo"> |
|
137 <a href="http://mercurial.selenic.com/"> |
|
138 <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
139 </div> |
|
140 <ul> |
|
141 <li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
142 <li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
143 <li><a href="/tags">tags</a></li> |
|
144 <li><a href="/branches">branches</a></li> |
|
145 </ul> |
|
146 <ul> |
|
147 <li><a href="/rev/78e4ebad7cdf">changeset</a></li> |
|
148 <li><a href="/file/78e4ebad7cdf">browse</a></li> |
|
149 </ul> |
|
150 <ul> |
|
151 <li><a href="/file/78e4ebad7cdf/a">file</a></li> |
|
152 <li><a href="/file/tip/a">latest</a></li> |
|
153 <li class="active">diff</li> |
|
154 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li> |
|
155 <li><a href="/log/78e4ebad7cdf/a">file log</a></li> |
|
156 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li> |
|
157 </ul> |
|
158 </div> |
|
159 |
|
160 <div class="main"> |
|
161 <h2><a href="/">test</a></h2> |
|
162 <h3>diff a @ 1:78e4ebad7cdf</h3> |
|
163 |
|
164 <form class="search" action="/log"> |
|
165 <p></p> |
|
166 <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
167 <div id="hint">find changesets by author, revision, |
|
168 files, or words in the commit message</div> |
|
169 </form> |
|
170 |
|
171 <div class="description">b</div> |
|
172 |
|
173 <table id="changesetEntry"> |
|
174 <tr> |
|
175 <th>author</th> |
|
176 <td>test</td> |
|
177 </tr> |
|
178 <tr> |
|
179 <th>date</th> |
|
180 <td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> |
|
181 </tr> |
|
182 <tr> |
|
183 <th>parents</th> |
|
184 <td></td> |
|
185 </tr> |
|
186 <tr> |
|
187 <th>children</th> |
|
188 <td></td> |
|
189 </tr> |
|
190 |
|
191 </table> |
|
192 |
|
193 <div class="overflow"> |
|
194 <div class="sourcefirst"> line diff</div> |
|
195 |
|
196 <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 |
|
197 </span><a href="#l1.2" id="l1.2"> 1.2</a> <span class="plusline">+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
198 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
199 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="plusline">+a |
|
200 </span></pre></div> |
|
201 </div> |
|
202 </div> |
|
203 </div> |
|
204 |
|
205 |
|
206 |
|
207 </body> |
|
208 </html> |
|
209 |
|
210 % set up hgweb with git diffs |
|
211 % revision |
|
212 200 Script output follows |
|
213 |
|
214 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
215 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
216 <head> |
|
217 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
218 <meta name="robots" content="index, nofollow" /> |
|
219 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
220 |
|
221 <title>test: 0cd96de13884</title> |
|
222 </head> |
|
223 <body> |
|
224 <div class="container"> |
|
225 <div class="menu"> |
|
226 <div class="logo"> |
|
227 <a href="http://mercurial.selenic.com/"> |
|
228 <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
229 </div> |
|
230 <ul> |
|
231 <li><a href="/shortlog/0cd96de13884">log</a></li> |
|
232 <li><a href="/graph/0cd96de13884">graph</a></li> |
|
233 <li><a href="/tags">tags</a></li> |
|
234 <li><a href="/branches">branches</a></li> |
|
235 </ul> |
|
236 <ul> |
|
237 <li class="active">changeset</li> |
|
238 <li><a href="/raw-rev/0cd96de13884">raw</a></li> |
|
239 <li><a href="/file/0cd96de13884">browse</a></li> |
|
240 </ul> |
|
241 <ul> |
|
242 |
|
243 </ul> |
|
244 </div> |
|
245 |
|
246 <div class="main"> |
|
247 |
|
248 <h2><a href="/">test</a></h2> |
|
249 <h3>changeset 0:0cd96de13884 </h3> |
|
250 |
|
251 <form class="search" action="/log"> |
|
252 |
|
253 <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
254 <div id="hint">find changesets by author, revision, |
|
255 files, or words in the commit message</div> |
|
256 </form> |
|
257 |
|
258 <div class="description">a</div> |
|
259 |
|
260 <table id="changesetEntry"> |
|
261 <tr> |
|
262 <th class="author">author</th> |
|
263 <td class="author">test</td> |
|
264 </tr> |
|
265 <tr> |
|
266 <th class="date">date</th> |
|
267 <td class="date">Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td></tr> |
|
268 <tr> |
|
269 <th class="author">parents</th> |
|
270 <td class="author"></td> |
|
271 </tr> |
|
272 <tr> |
|
273 <th class="author">children</th> |
|
274 <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td> |
|
275 </tr> |
|
276 <tr> |
|
277 <th class="files">files</th> |
|
278 <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td> |
|
279 </tr> |
|
280 </table> |
|
281 |
|
282 <div class="overflow"> |
|
283 <div class="sourcefirst"> line diff</div> |
|
284 |
|
285 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100644 |
|
286 <a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null |
|
287 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a |
|
288 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
289 </span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a |
|
290 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1"> 2.1</a> new file mode 100644 |
|
291 <a href="#l2.2" id="l2.2"> 2.2</a> <span class="minusline">--- /dev/null |
|
292 </span><a href="#l2.3" id="l2.3"> 2.3</a> <span class="plusline">+++ b/b |
|
293 </span><a href="#l2.4" id="l2.4"> 2.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
294 </span><a href="#l2.5" id="l2.5"> 2.5</a> <span class="plusline">+b |
|
295 </span></pre></div> |
|
296 </div> |
|
297 |
|
298 </div> |
|
299 </div> |
|
300 |
|
301 |
|
302 </body> |
|
303 </html> |
|
304 |
|
305 % revision |
|
306 200 Script output follows |
|
307 |
|
308 |
|
309 # HG changeset patch |
|
310 # User test |
|
311 # Date 0 0 |
|
312 # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e |
|
313 |
|
314 a |
|
315 |
|
316 diff --git a/a b/a |
|
317 new file mode 100644 |
|
318 --- /dev/null |
|
319 +++ b/a |
|
320 @@ -0,0 +1,1 @@ |
|
321 +a |
|
322 diff --git a/b b/b |
|
323 new file mode 100644 |
|
324 --- /dev/null |
|
325 +++ b/b |
|
326 @@ -0,0 +1,1 @@ |
|
327 +b |
|
328 |
|
329 % diff removed file |
|
330 200 Script output follows |
|
331 |
|
332 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
333 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
334 <head> |
|
335 <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
336 <meta name="robots" content="index, nofollow" /> |
|
337 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
338 |
|
339 <title>test: a diff</title> |
|
340 </head> |
|
341 <body> |
|
342 |
|
343 <div class="container"> |
|
344 <div class="menu"> |
|
345 <div class="logo"> |
|
346 <a href="http://mercurial.selenic.com/"> |
|
347 <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
348 </div> |
|
349 <ul> |
|
350 <li><a href="/shortlog/78e4ebad7cdf">log</a></li> |
|
351 <li><a href="/graph/78e4ebad7cdf">graph</a></li> |
|
352 <li><a href="/tags">tags</a></li> |
|
353 <li><a href="/branches">branches</a></li> |
|
354 </ul> |
|
355 <ul> |
|
356 <li><a href="/rev/78e4ebad7cdf">changeset</a></li> |
|
357 <li><a href="/file/78e4ebad7cdf">browse</a></li> |
|
358 </ul> |
|
359 <ul> |
|
360 <li><a href="/file/78e4ebad7cdf/a">file</a></li> |
|
361 <li><a href="/file/tip/a">latest</a></li> |
|
362 <li class="active">diff</li> |
|
363 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li> |
|
364 <li><a href="/log/78e4ebad7cdf/a">file log</a></li> |
|
365 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li> |
|
366 </ul> |
|
367 </div> |
|
368 |
|
369 <div class="main"> |
|
370 <h2><a href="/">test</a></h2> |
|
371 <h3>diff a @ 1:78e4ebad7cdf</h3> |
|
372 |
|
373 <form class="search" action="/log"> |
|
374 <p></p> |
|
375 <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
376 <div id="hint">find changesets by author, revision, |
|
377 files, or words in the commit message</div> |
|
378 </form> |
|
379 |
|
380 <div class="description">b</div> |
|
381 |
|
382 <table id="changesetEntry"> |
|
383 <tr> |
|
384 <th>author</th> |
|
385 <td>test</td> |
|
386 </tr> |
|
387 <tr> |
|
388 <th>date</th> |
|
389 <td>Thu Jan 01 00:00:00 1970 +0000 (1970-01-01)</td> |
|
390 </tr> |
|
391 <tr> |
|
392 <th>parents</th> |
|
393 <td></td> |
|
394 </tr> |
|
395 <tr> |
|
396 <th>children</th> |
|
397 <td></td> |
|
398 </tr> |
|
399 |
|
400 </table> |
|
401 |
|
402 <div class="overflow"> |
|
403 <div class="sourcefirst"> line diff</div> |
|
404 |
|
405 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1"> 1.1</a> new file mode 100755 |
|
406 <a href="#l1.2" id="l1.2"> 1.2</a> <span class="minusline">--- /dev/null |
|
407 </span><a href="#l1.3" id="l1.3"> 1.3</a> <span class="plusline">+++ b/a |
|
408 </span><a href="#l1.4" id="l1.4"> 1.4</a> <span class="atline">@@ -0,0 +1,1 @@ |
|
409 </span><a href="#l1.5" id="l1.5"> 1.5</a> <span class="plusline">+a |
|
410 </span></pre></div> |
|
411 </div> |
|
412 </div> |
|
413 </div> |
|
414 |
|
415 |
|
416 |
|
417 </body> |
|
418 </html> |
|
419 |
|
420 % test import rev as raw-rev |
|
421 requesting all changes |
|
422 adding changesets |
|
423 adding manifests |
|
424 adding file changes |
|
425 added 1 changesets with 2 changes to 2 files |
|
426 updating to branch default |
|
427 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
428 % errors |
|