annotate tests/test-hgweb-empty.t @ 16536:63c817ea4a70 stable

commit: abort on merge with missing files Here is a script illustrating the previous behaviour: The merge brings a new file 'b' from remote $ hg merge 1 --debug searching for copies back to rev 1 unmatched files in other: b resolving manifests overwrite: False, partial: False ancestor: 07f494440405, local: 540395c44225+, remote: 102a90ea7b4a b: remote created -> g updating: b 1/1 files (100.00%) getting b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Delete but do not remove b $ rm b $ hg st ! b The commit succeeds $ hg commit -m merge $ hg parents --template "{rev} {desc|firstline} files: {files}\n" 3 merge files: $ hg st ! b b changes were ignored, but even b existence was ignored $ hg manifest a This happens because localrepo.commitctx() checks the input ctx.files(), which is empty for workingctx.files() only returns added, modified or removed entries, and bypass files/manifest updates completely. So the committed revision manifest is the same as its first parent one, not containing the 'b' file. This patch forces the commit to abort in presence of a merge and missing files. test-merge4.t is modified accordingly as it was introduced to check hg was not just terminating with a traceback (5e9e8b8d2629).
author Patrick Mezard <patrick@mezard.eu>
date Sat, 28 Apr 2012 15:01:57 +0200
parents 8fd18eb8aab7
children f2719b387380
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 15071
diff changeset
1 $ "$TESTDIR/hghave" serve || exit 80
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 15071
diff changeset
2
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
3 Some tests for hgweb in an empty repository
7565
5f162f61e479 hgweb: fix problems with empty repositories
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff changeset
4
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
5 $ hg init test
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
6 $ cd test
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
7 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
8 $ cat hg.pid >> $DAEMON_PIDS
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
9 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/shortlog')
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
10 200 Script output follows
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
11
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
12 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
13 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
14 <head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
15 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
16 <meta name="robots" content="index, nofollow" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
17 <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: 13622
diff changeset
18 <script type="text/javascript" src="/static/mercurial.js"></script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
19
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
20 <title>test: log</title>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
21 <link rel="alternate" type="application/atom+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
22 href="/atom-log" title="Atom feed for test" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
23 <link rel="alternate" type="application/rss+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
24 href="/rss-log" title="RSS feed for test" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
25 </head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
26 <body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
27
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
28 <div class="container">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
29 <div class="menu">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
30 <div class="logo">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
31 <a href="http://mercurial.selenic.com/">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
32 <img src="/static/hglogo.png" alt="mercurial" /></a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
33 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
34 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
35 <li class="active">log</li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
36 <li><a href="/graph/000000000000">graph</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
37 <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
38 <li><a href="/bookmarks">bookmarks</a></li>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
39 <li><a href="/branches">branches</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
40 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
41 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
42 <li><a href="/rev/000000000000">changeset</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
43 <li><a href="/file/000000000000">browse</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
44 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
45 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
46
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
47 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
48 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
49 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
50 </ul>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
51 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
52
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
53 <div class="main">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
54 <h2><a href="/">test</a></h2>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
55 <h3>log</h3>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
56
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
57 <form class="search" action="/log">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
58
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
59 <p><input name="rev" id="search1" type="text" size="30" /></p>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
60 <div id="hint">find changesets by author, revision,
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
61 files, or words in the commit message</div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
62 </form>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
63
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
64 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
65 <a href="/shortlog/-1?revcount=30">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
66 <a href="/shortlog/-1?revcount=120">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
67 | rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
68 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
69
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
70 <table class="bigtable">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
71 <tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
72 <th class="age">age</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
73 <th class="author">author</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
74 <th class="description">description</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
75 </tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
76
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
77 </table>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
78
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
79 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
80 <a href="/shortlog/-1?revcount=30">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
81 <a href="/shortlog/-1?revcount=120">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
82 | rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
83 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
84
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
85 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
86 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
87
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13622
diff changeset
88 <script type="text/javascript">process_dates()</script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
89
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
90
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
91 </body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
92 </html>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
93
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
94 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log')
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
95 200 Script output follows
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
96
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
97 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
98 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
99 <head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
100 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
101 <meta name="robots" content="index, nofollow" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
102 <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: 13622
diff changeset
103 <script type="text/javascript" src="/static/mercurial.js"></script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
104
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
105 <title>test: log</title>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
106 <link rel="alternate" type="application/atom+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
107 href="/atom-log" title="Atom feed for test" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
108 <link rel="alternate" type="application/rss+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
109 href="/rss-log" title="RSS feed for test" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
110 </head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
111 <body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
112
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
113 <div class="container">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
114 <div class="menu">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
115 <div class="logo">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
116 <a href="http://mercurial.selenic.com/">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
117 <img src="/static/hglogo.png" alt="mercurial" /></a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
118 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
119 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
120 <li class="active">log</li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
121 <li><a href="/graph/000000000000">graph</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
122 <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
123 <li><a href="/bookmarks">bookmarks</a></li>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
124 <li><a href="/branches">branches</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
125 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
126 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
127 <li><a href="/rev/000000000000">changeset</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
128 <li><a href="/file/000000000000">browse</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
129 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
130 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
131
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
132 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
133 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
134 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
135 </ul>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
136 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
137
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
138 <div class="main">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
139 <h2><a href="/">test</a></h2>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
140 <h3>log</h3>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
141
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
142 <form class="search" action="/log">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
143
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
144 <p><input name="rev" id="search1" type="text" size="30" /></p>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
145 <div id="hint">find changesets by author, revision,
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
146 files, or words in the commit message</div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
147 </form>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
148
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
149 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
150 <a href="/shortlog/-1?revcount=5">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
151 <a href="/shortlog/-1?revcount=20">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
152 | rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
153 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
154
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
155 <table class="bigtable">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
156 <tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
157 <th class="age">age</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
158 <th class="author">author</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
159 <th class="description">description</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
160 </tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
161
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
162 </table>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
163
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
164 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
165 <a href="/shortlog/-1?revcount=5">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
166 <a href="/shortlog/-1?revcount=20">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
167 | rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
168 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
169
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
170 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
171 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
172
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13622
diff changeset
173 <script type="text/javascript">process_dates()</script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
174
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
175
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
176 </body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
177 </html>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
178
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
179 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/graph')
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
180 200 Script output follows
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
181
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
182 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
183 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
184 <head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
185 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
186 <meta name="robots" content="index, nofollow" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
187 <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: 13622
diff changeset
188 <script type="text/javascript" src="/static/mercurial.js"></script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
189
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
190 <title>test: revision graph</title>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
191 <link rel="alternate" type="application/atom+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
192 href="/atom-log" title="Atom feed for test: log" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
193 <link rel="alternate" type="application/rss+xml"
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
194 href="/rss-log" title="RSS feed for test: log" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
195 <!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]-->
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
196 </head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
197 <body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
198
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
199 <div class="container">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
200 <div class="menu">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
201 <div class="logo">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
202 <a href="http://mercurial.selenic.com/">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
203 <img src="/static/hglogo.png" alt="mercurial" /></a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
204 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
205 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
206 <li><a href="/shortlog/000000000000">log</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
207 <li class="active">graph</li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
208 <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
209 <li><a href="/bookmarks">bookmarks</a></li>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
210 <li><a href="/branches">branches</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
211 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
212 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
213 <li><a href="/rev/000000000000">changeset</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
214 <li><a href="/file/000000000000">browse</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
215 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
216 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
217 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
218 </ul>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
219 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
220
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
221 <div class="main">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
222 <h2><a href="/">test</a></h2>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
223 <h3>graph</h3>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
224
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
225 <form class="search" action="/log">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
226
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
227 <p><input name="rev" id="search1" type="text" size="30" /></p>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
228 <div id="hint">find changesets by author, revision,
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
229 files, or words in the commit message</div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
230 </form>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
231
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
232 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
233 <a href="/graph/-1?revcount=30">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
234 <a href="/graph/-1?revcount=120">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
235 | rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
236 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
237
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
238 <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
239
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
240 <div id="wrapper">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
241 <ul id="nodebgs"></ul>
13622
0a8ba9124623 tests: fix failures introduced in 7359cb753a54
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 13597
diff changeset
242 <canvas id="graph" width="480" height="12"></canvas>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
243 <ul id="graphnodes"></ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
244 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
245
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
246 <script type="text/javascript">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
247 <!-- hide script content
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
248
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
249 var data = [];
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
250 var graph = new Graph();
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
251 graph.scale(39);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
252
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
253 var revlink = '<li style="_STYLE"><span class="desc">';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
254 revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
255 revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
256
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
257 graph.vertex = function(x, y, color, parity, cur) {
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
258
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
259 this.ctx.beginPath();
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
260 color = this.setColor(color, 0.25, 0.75);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
261 this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
262 this.ctx.fill();
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
263
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
264 var bg = '<li class="bg parity' + parity + '"></li>';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
265 var left = (this.columns + 1) * this.bg_height;
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
266 var nstyle = 'padding-left: ' + left + 'px;';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
267 var item = revlink.replace(/_STYLE/, nstyle);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
268 item = item.replace(/_PARITY/, 'parity' + parity);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
269 item = item.replace(/_NODEID/, cur[0]);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
270 item = item.replace(/_NODEID/, cur[0]);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
271 item = item.replace(/_DESC/, cur[3]);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
272 item = item.replace(/_USER/, cur[4]);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
273 item = item.replace(/_DATE/, cur[5]);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
274
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
275 var tagspan = '';
15071
ad6eb7d7dbca hgweb: properly check for bookmarks when drawing graph
Matt Mackall <mpm@selenic.com>
parents: 14046
diff changeset
276 if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) {
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
277 tagspan = '<span class="logtags">';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
278 if (cur[6][1]) {
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
279 tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
280 tagspan += cur[6][0] + '</span> ';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
281 } else if (!cur[6][1] && cur[6][0] != 'default') {
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
282 tagspan += '<span class="branchname" title="' + cur[6][0] + '">';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
283 tagspan += cur[6][0] + '</span> ';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
284 }
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
285 if (cur[7].length) {
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
286 for (var t in cur[7]) {
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
287 var tag = cur[7][t];
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
288 tagspan += '<span class="tag">' + tag + '</span> ';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
289 }
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
290 }
13596
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
291 if (cur[8].length) {
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
292 for (var b in cur[8]) {
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
293 var bookmark = cur[8][b];
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
294 tagspan += '<span class="tag">' + bookmark + '</span> ';
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
295 }
270f57d35525 hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents: 12846
diff changeset
296 }
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
297 tagspan += '</span>';
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
298 }
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
299
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
300 item = item.replace(/_TAGS/, tagspan);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
301 return [bg, item];
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
302
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
303 }
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
304
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
305 graph.render(data);
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
306
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
307 // stop hiding script -->
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
308 </script>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
309
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
310 <div class="navigate">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
311 <a href="/graph/-1?revcount=30">less</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
312 <a href="/graph/-1?revcount=120">more</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
313 | rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
314 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
315
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
316 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
317 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
318
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13622
diff changeset
319 <script type="text/javascript">process_dates()</script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
320
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
321
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
322 </body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
323 </html>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
324
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
325 $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file')
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
326 200 Script output follows
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
327
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
328 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
329 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
330 <head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
331 <link rel="icon" href="/static/hgicon.png" type="image/png" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
332 <meta name="robots" content="index, nofollow" />
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
333 <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: 13622
diff changeset
334 <script type="text/javascript" src="/static/mercurial.js"></script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
335
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
336 <title>test: 000000000000 /</title>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
337 </head>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
338 <body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
339
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
340 <div class="container">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
341 <div class="menu">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
342 <div class="logo">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
343 <a href="http://mercurial.selenic.com/">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
344 <img src="/static/hglogo.png" alt="mercurial" /></a>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
345 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
346 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
347 <li><a href="/shortlog/000000000000">log</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
348 <li><a href="/graph/000000000000">graph</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
349 <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
350 <li><a href="/bookmarks">bookmarks</a></li>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
351 <li><a href="/branches">branches</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
352 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
353 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
354 <li><a href="/rev/000000000000">changeset</a></li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
355 <li class="active">browse</li>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
356 </ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
357 <ul>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
358
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
359 </ul>
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
360 <ul>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
361 <li><a href="/help">help</a></li>
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 12436
diff changeset
362 </ul>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
363 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
364
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
365 <div class="main">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
366 <h2><a href="/">test</a></h2>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
367 <h3>directory / @ -1:000000000000 <span class="tag">tip</span> </h3>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
368
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
369 <form class="search" action="/log">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
370
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
371 <p><input name="rev" id="search1" type="text" size="30" /></p>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
372 <div id="hint">find changesets by author, revision,
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
373 files, or words in the commit message</div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
374 </form>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
375
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
376 <table class="bigtable">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
377 <tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
378 <th class="name">name</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
379 <th class="size">size</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
380 <th class="permissions">permissions</th>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
381 </tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
382 <tr class="fileline parity0">
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
383 <td class="name"><a href="/file/000000000000/">[up]</a></td>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
384 <td class="size"></td>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
385 <td class="permissions">drwxr-xr-x</td>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
386 </tr>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
387
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
388
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
389 </table>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
390 </div>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
391 </div>
14046
b24e5a708fad web: Made elapsed time calculation dynamic (javascript).
Benoit Allard <benoit@aeteurope.nl>
parents: 13622
diff changeset
392 <script type="text/javascript">process_dates()</script>
12436
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
393
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
394
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
395 </body>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
396 </html>
b52ce78de84d tests: unify test-hgweb-empty
Matt Mackall <mpm@selenic.com>
parents: 7565
diff changeset
397