Mercurial > hg

annotate mercurial/templates/monoblue/filecomparison.tmpl @ 17797:e4da793998bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: normalize paths in filemaps (issue3612) convert doesn't normalise double slashes in paths. Path normalization is applied when a path is loaded into filemap and when a file lookup request is issued to filemap.
author Huayang <huayang@fb.com>
date Fri, 05 Oct 2012 16:27:34 -0700
parents 5c64ce6168da
children bebb05a7e249
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
1 {header}
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
2 <title>{repo|escape}: comparison {file|escape}</title>
8430
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset
3 <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
8b47efdf40ee monoblue: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8355
diff changeset
4 <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
5 </head>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
6
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
7 <body>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
8 <div id="container">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
9 <div class="page-header">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file comparison</h1>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
11
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
12 <form action="{url}log">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
13 {sessionvars%hiddenformentry}
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
14 <dl class="search">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
15 <dt><label>Search: </label></dt>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
16 <dd><input type="text" name="rev" /></dd>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
17 </dl>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
18 </form>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
19
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
20 <ul class="page-nav">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
21 <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
22 <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
13860
b5b84dd43613 hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)
Yuya Nishihara <yuya@tcha.org>
parents: 12680
diff changeset
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
8355
5ba798f339c8 monoblue: add branches page
Sune Foldager <cryo@cyanite.org>
parents: 7111
diff changeset
27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
28 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
12680
d664547ef540 hgweb: add help link to templates missed in ead4e21f49f1
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset
29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
30 </ul>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
31 </div>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
32
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
33 <ul class="submenu">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
34 <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
35 <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
36 <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
37 <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
38 <li class="current">comparison</li>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
39 <li><a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a></li>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
40 </ul>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
41
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
42 <h2 class="no-link no-border">comparison: {file|escape}</h2>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
43 <h3 class="changeset">{file|escape}</h3>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
44
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
45 <dl class="overview">
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
46 {branch%filerevbranch}
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
47 <dt>changeset {rev}</dt>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
48 <dd><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
49 {parent%filecompparent}
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
50 {child%filecompchild}
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
51 </dl>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
52
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
53 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
54 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
55 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
56 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
57 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
58 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
59
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 13860
diff changeset
60 <div class="comparison">
17302
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
61 <table class="bigtable">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
62 <thead class="header">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
63 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
64 <th>{leftrev}:{leftnode|short}</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
65 <th>{rightrev}:{rightnode|short}</th>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
66 </tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
67 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
68 {comparison}
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
69 </table>
7111
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
70 </div>
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
71
91b0ada2d94b added monoblue hgweb theme
Hiroshi Funai <hfunai@gmail.com>
parents:
diff changeset
72 {footer}