Mercurial > hg

annotate tests/test-hgweb-removed.t @ 27032:28ee7af4b685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: return whether the file is deleted for nomerge internal tools We're going to support the filemerge code resolving change/delete conflicts in upcoming patches. Some of these resolutions require that the dirstate be modified. Modifying the dirstate directly from in here would be (a) a pretty bad layering violation and (b) wrong because all dirstate removals should happen before adds. So in this and upcoming patches we're instead going to pass whether the file is deleted up to merge.mergestate, then in there figure out what dirstate action needs to be taken.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 13:52:28 -0800
parents 4b0fc75f9403
children eb7de21b15be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 19796
diff changeset
1 #require serve
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 15375
diff changeset
2
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
3 setting up repo
8452
cb93eee1fbcd tests: add missing interpreter lines
Martin Geisler <mg@lazybytes.net>
parents: 7183
diff changeset
4
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
5 $ hg init test
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
6 $ cd test
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
7 $ echo a > a
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
8 $ hg ci -Ama
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
9 adding a
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
10 $ hg rm a
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
11 $ hg ci -mdel
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
12
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
13 set up hgweb
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
14
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
15 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
16 $ cat hg.pid >> $DAEMON_PIDS
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
17
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
18 revision
7183
099b4f9be5ab hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
19
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25134
diff changeset
20 $ get-with-headers.py localhost:$HGPORT 'rev/tip'
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
21 200 Script output follows
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
22
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
23 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
24 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
25 <head>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
26 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
27 <meta name="robots" content="index, nofollow" />
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
28 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
29 <script type="text/javascript" src="/static/mercurial.js"></script>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
30
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
31 <title>test: c78f6c5cbea9</title>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
32 </head>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
33 <body>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
34 <div class="container">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
35 <div class="menu">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
36 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
37 <a href="https://mercurial-scm.org/">
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
38 <img src="/static/hglogo.png" alt="mercurial" /></a>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
39 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
40 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
41 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
42 <li><a href="/graph/tip">graph</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
43 <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
44 <li><a href="/bookmarks">bookmarks</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
45 <li><a href="/branches">branches</a></li>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
46 </ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
47 <ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
48 <li class="active">changeset</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
49 <li><a href="/raw-rev/tip">raw</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
50 <li><a href="/file/tip">browse</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
51 </ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
52 <ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
53
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
54 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12442
diff changeset
55 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12442
diff changeset
56 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12442
diff changeset
57 </ul>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
58 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
59
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
60 <div class="main">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
61
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
62 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
63 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
64 changeset 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
65 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
66 </h3>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
67
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
68 <form class="search" action="/log">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
69
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
70 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
71 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
72 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
73 </form>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
74
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
75 <div class="description">del</div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
76
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
77 <table id="changesetEntry">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
78 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
79 <th class="author">author</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
80 <td class="author">&#116;&#101;&#115;&#116;</td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
81 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
82 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
83 <th class="date">date</th>
24130
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
84 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
03f692eee31d hgweb: clearly outline <tr> block in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 24042
diff changeset
85 </tr>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
86 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
87 <th class="author">parents</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
88 <td class="author"><a href="/rev/cb9a9f314b8b">cb9a9f314b8b</a> </td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
89 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
90 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
91 <th class="author">children</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
92 <td class="author"></td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
93 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
94 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
95 <th class="files">files</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
96 <td class="files">a </td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
97 </tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
98 <tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
99 <th class="diffstat">diffstat</th>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
100 <td class="diffstat">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
101 1 files changed, 0 insertions(+), 1 deletions(-)
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
102
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
103 <a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
104 <div id="diffstatdetails" style="display:none;">
23831
0ab23a48b9a7 hgweb: fix diffstat links in paper/changeset.tmpl
Anton Shestakov <engored@ya.ru>
parents: 23829
diff changeset
105 <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
24042
bf661a03fddc hgweb: use css margin instead of empty <p> before diffstat table
Anton Shestakov <engored@ya.ru>
parents: 23831
diff changeset
106 <table class="diffstat-table stripes2"> <tr>
14571
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
107 <td class="diffstat-file"><a href="#l1.1">a</a></td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
108 <td class="diffstat-total" align="right">1</td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
109 <td class="diffstat-graph">
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
110 <span class="diffstat-add" style="width:0.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
111 <span class="diffstat-remove" style="width:100.0%;">&nbsp;</span>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
112 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
113 </tr>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
114 </table>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
115 </div>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
116 </td>
17c0cb1045e5 paper, coal: display diffstat on the changeset page
Steven Brown <StevenGBrown@gmail.com>
parents: 14046
diff changeset
117 </tr>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
118 </table>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
119
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
120 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
121 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
122 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
123 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
124 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
125 <span id="l1.1" class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
126 <span id="l1.2" class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
127 <span id="l1.3" class="atline">@@ -1,1 +0,0 @@</span><a href="#l1.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
128 <span id="l1.4" class="minusline">-a</span><a href="#l1.4"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
129 </div>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
130 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
131
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
132 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
133 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
134 <script type="text/javascript">process_dates()</script>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
135
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
136
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
137 </body>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
138 </html>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
139
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
140
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
141 diff removed file
7183
099b4f9be5ab hgweb: working diff for removed files
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
142
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25134
diff changeset
143 $ get-with-headers.py localhost:$HGPORT 'diff/tip/a'
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
144 200 Script output follows
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
145
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
146 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
147 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
148 <head>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
149 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
150 <meta name="robots" content="index, nofollow" />
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
151 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
152 <script type="text/javascript" src="/static/mercurial.js"></script>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
153
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
154 <title>test: a diff</title>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
155 </head>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
156 <body>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
157
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
158 <div class="container">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
159 <div class="menu">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
160 <div class="logo">
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25617
diff changeset
161 <a href="https://mercurial-scm.org/">
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
162 <img src="/static/hglogo.png" alt="mercurial" /></a>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
163 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
164 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
165 <li><a href="/shortlog/tip">log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
166 <li><a href="/graph/tip">graph</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
167 <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
168 <li><a href="/bookmarks">bookmarks</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
169 <li><a href="/branches">branches</a></li>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
170 </ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
171 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
172 <li><a href="/rev/tip">changeset</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
173 <li><a href="/file/tip">browse</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
174 </ul>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
175 <ul>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
176 <li><a href="/file/tip/a">file</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
177 <li><a href="/file/tip/a">latest</a></li>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
178 <li class="active">diff</li>
25606
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
179 <li><a href="/comparison/tip/a">comparison</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
180 <li><a href="/annotate/tip/a">annotate</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
181 <li><a href="/log/tip/a">file log</a></li>
3bb6f5f478a7 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)
Anton Shestakov <av6@dwimlabs.net>
parents: 25472
diff changeset
182 <li><a href="/raw-file/tip/a">raw</a></li>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
183 </ul>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
184 <ul>
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 12666
diff changeset
185 <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
186 </ul>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
187 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
188
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
189 <div class="main">
18264
d6ebdbdd70a5 tests: update hgweb tests to include breadcrumbs
Bryan O'Sullivan <bryano@fb.com>
parents: 17991
diff changeset
190 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
25617
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
191 <h3>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
192 diff a @ 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
193 <span class="tag">tip</span>
63be46407a50 hgweb: link to revision by node hash in paper & coal
Anton Shestakov <av6@dwimlabs.net>
parents: 25606
diff changeset
194 </h3>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
195
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
196 <form class="search" action="/log">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
197 <p></p>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
198 <p><input name="rev" id="search1" type="text" size="30" /></p>
19796
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
199 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
544848ef65f2 paper: edit search hint to include new feature description
Alexander Plavin <alexander@plav.in>
parents: 19795
diff changeset
200 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
201 </form>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
202
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
203 <div class="description">del</div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
204
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
205 <table id="changesetEntry">
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
206 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
207 <th>author</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
208 <td>&#116;&#101;&#115;&#116;</td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
209 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
210 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
211 <th>date</th>
15375
fe9d36a6853e hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents: 14608
diff changeset
212 <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
213 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
214 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
215 <th>parents</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
216 <td><a href="/file/cb9a9f314b8b/a">cb9a9f314b8b</a> </td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
217 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
218 <tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
219 <th>children</th>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
220 <td></td>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
221 </tr>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
222 </table>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
223
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
224 <div class="overflow">
19433
a79b21ece345 hgweb: add line wrapping switch to file diff and changeset views
Alexander Plavin <me@aplavin.ru>
parents: 19432
diff changeset
225 <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
19432
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
226 <div class="sourcefirst"> line diff</div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
227 <div class="stripes2 diffblocks">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
228 <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
229 <span id="l1.1" class="minusline">--- a/a Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
230 <span id="l1.2" class="plusline">+++ /dev/null Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
231 <span id="l1.3" class="atline">@@ -1,1 +0,0 @@</span><a href="#l1.3"></a>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
232 <span id="l1.4" class="minusline">-a</span><a href="#l1.4"></a></pre></div>
e92d4b8530cb hgweb: file diff and changesets views behave like file source view
Alexander Plavin <me@aplavin.ru>
parents: 19428
diff changeset
233 </div>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
234 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
235 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
236 </div>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
237
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13597
diff changeset
238 <script type="text/javascript">process_dates()</script>
12442
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
239
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
240
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
241 </body>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
242 </html>
b7fd332e5ca2 tests: unify test-hgweb-removed
Matt Mackall <mpm@selenic.com>
parents: 8452
diff changeset
243
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
244
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15446
diff changeset
245 $ cd ..