Mercurial > hg

annotate mercurial/templates/gitweb/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
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 {header}
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
2 <title>{repo|escape}: comparison {file|escape}</title>
5269
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4467
diff changeset
3 <link rel="alternate" type="application/atom+xml"
8427
cebdfdcc3e42 git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8356
diff changeset
4 href="{url}atom-log" title="Atom feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5 <link rel="alternate" type="application/rss+xml"
5820
3a1ffc1da32c Fixed numerous XHTML problems that caused validation errors and warnings.
Kevin Christen <kevin.christen@gmail.com>
parents: 5269
diff changeset
6 href="{url}rss-log" title="RSS feed for {repo|escape}"/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 </head>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8 <body>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 <div class="page_header">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
11 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / comparison
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 </div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 <div class="page_nav">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
16 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
6693
7f58dec6aeb7 hgweb: Fix up non-coal styles to support graph.
Augie Fackler <durin42@gmail.com>
parents: 6250
diff changeset
18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
13864
fd8a6ca3a750 hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
Yuya Nishihara <yuya@tcha.org>
parents: 12666
diff changeset
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
8356
439663cd043a gitweb: add branches page
Sune Foldager <cryo@cyanite.org>
parents: 6693
diff changeset
21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
6177
673d8a6bc709 Renamed "manifest" to "files" in web templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5820
diff changeset
22 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
23 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
24 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
9882
b3b57ecbda50 gitweb: add a latest link to the gitweb style
Zhigang Wang <w1z2g3@gmail.com>
parents: 8936
diff changeset
25 <a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> |
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3353
diff changeset
26 <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
3364
537a93cafa79 Fixed typo in gitweb templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3363
diff changeset
27 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
28 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
29 comparison |
16844
a7ba57b10530 hgweb: fixes linebreak location in gitweb filediff.tmpl view
wujek srujek <wujek.srujek@googlemail.com>
parents: 13964
diff changeset
30 <a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a> |
12666
ead4e21f49f1 web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents: 9999
diff changeset
31 <a href="{url}help{sessionvars%urlparameter}">help</a>
16844
a7ba57b10530 hgweb: fixes linebreak location in gitweb filediff.tmpl view
wujek srujek <wujek.srujek@googlemail.com>
parents: 13964
diff changeset
32 <br/>
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
33 </div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
34
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
35 <div class="title">{file|escape}</div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
36
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
37 <table>
6250
bf0dd23f55fa gitweb: show branches in most of the templates
Florent Guillaume <fg@nuxeo.com>
parents: 6177
diff changeset
38 {branch%filerevbranch}
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
39 <tr>
4467
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
40 <td>changeset {rev}</td>
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
41 <td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
42 {parent%filecompparent}
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
43 {child%filecompchild}
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
44 </table>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
45
4467
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
46 <div class="list_head"></div>
faf2fa0f3fff gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3364
diff changeset
47
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
48 <div class="page_body">
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
49
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
50 <div class="legend">
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
51 <span class="legendinfo equal">equal</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
52 <span class="legendinfo delete">deleted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
53 <span class="legendinfo insert">inserted</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
54 <span class="legendinfo replace">replaced</span>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
55 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
56
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
57 <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
58 <table style="border-collapse:collapse;">
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
59 <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
60 <tr>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
61 <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
62 <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
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 </thead>
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
65 {comparison}
5c64ce6168da hgweb: fixes traceback for invalid files by removing top-level template
wujek srujek <wujek.srujek@googlemail.com>
parents: 17202
diff changeset
66 </table>
17202
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
67 </div>
1ae119269ddc hgweb: side-by-side comparison functionality
wujek srujek
parents: 16844
diff changeset
68
3353
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
69 </div>
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
70
2edf53386d86 gitweb: add file diff view
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
71 {footer}