Mercurial > hg > mercurial-crew-with-dirclash

annotate templates/gitweb/filerevision.tmpl @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 46c5e1ee8aaa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
1 #header#
3471
62f53b8f00c4 gitweb: add revision numbers to filerevision changeset links
Brendan Cully <brendan@kublai.com>
parents: 3395
diff changeset
2 <title>{repo|escape}: {file|escape}@{node|short}</title>
5266
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4464
diff changeset
3 <link rel="alternate" type="application/atom+xml"
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4464
diff changeset
4 href="{url}atom-log" title="Atom feed for #repo|escape#">
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
5 <link rel="alternate" type="application/rss+xml"
3270
36fa5db79dd5 hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents: 3226
diff changeset
6 href="{url}rss-log" title="RSS feed for #repo|escape#">
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
7 </head>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
8 <body>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
9
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
10 <div class="page_header">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
11 <a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / file revision
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
12 </div>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
13
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
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: 3350
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: 3350
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: 3350
diff changeset
17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
18 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
19 <a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
20 <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
3270
36fa5db79dd5 hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents: 3226
diff changeset
21 file |
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
22 <a href="{url}log/{node|short}/#file|urlescape#{sessionvars%urlparameter}">revisions</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
23 <a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">annotate</a> |
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3350
diff changeset
24 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
3278
4b2d3c8a6195 hgweb: fix filerevision raw URL
Brendan Cully <brendan@kublai.com>
parents: 3270
diff changeset
25 <a href="{url}raw-file/{node|short}/#file|urlescape#">raw</a><br/>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
26 </div>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
27
1650
f2ebd5251e88 changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents: 1606
diff changeset
28 <div class="title">#file|escape#</div>
1575
0a1cca912fda [hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1573
diff changeset
29
3395
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
30 <div class="title_text">
4464
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
31 <table cellspacing="0">
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
32 <tr>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
33 <td>author</td>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
34 <td>#author|obfuscate#</td></tr>
1575
0a1cca912fda [hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1573
diff changeset
35 <tr>
4464
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
36 <td></td>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
37 <td>#date|date# (#date|age# ago)</td></tr>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
38 <tr>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
39 <td>changeset {rev}</td>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
40 <td style="font-family:monospace"><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
3366
dca067d751a9 gitweb: Fixed parent/child links when viewing a file revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3363
diff changeset
41 #parent%filerevparent#
dca067d751a9 gitweb: Fixed parent/child links when viewing a file revision.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3363
diff changeset
42 #child%filerevchild#
1575
0a1cca912fda [hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1573
diff changeset
43 <tr>
4464
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
44 <td>permissions</td>
e8da331a860f gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3471
diff changeset
45 <td style="font-family:monospace">#permissions|permissions#</td></tr>
1575
0a1cca912fda [hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1573
diff changeset
46 </table>
3395
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
47 </div>
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
48
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
49 <div class="page_path">
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
50 {desc|strip|escape|addbreaks}
3c8f0dc9a6d3 hgweb: add changeset description to file revision page
Brendan Cully <brendan@kublai.com>
parents: 3393
diff changeset
51 </div>
1575
0a1cca912fda [hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1573
diff changeset
52
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
53 <div class="page_body">
1573
28305666f4c9 File revision style fixed
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 1572
diff changeset
54 #text%fileline#
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
55 </div>
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
56
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
57 #footer#