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

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 fc34c031ff54
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
1 #header#
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
2 <title>#repo|escape#:#file|escape#</title>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
3 </head>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
4 <body>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
5
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
6 <div class="buttons">
1410
17703aa4491e hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents: 1370
diff changeset
7 <a href="?cl=#rev#">changelog</a>
2687
46b19175fec6 [hgweb] links to shortlog for the default templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 1653
diff changeset
8 <a href="?sl=#rev#">shortlog</a>
1410
17703aa4491e hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents: 1370
diff changeset
9 <a href="?tags=">tags</a>
17703aa4491e hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents: 1370
diff changeset
10 <a href="?cs=#node|short#">changeset</a>
3205
48395d2692de hgweb: kill #manifest#
Brendan Cully <brendan@kublai.com>
parents: 2687
diff changeset
11 <a href="?mf=#node|short#;path=#path|urlescape#">manifest</a>
3206
79fd7a92f3e2 hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
12 <a href="?fl=#node|short#;file=#file|urlescape#">revisions</a>
79fd7a92f3e2 hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
13 <a href="?fa=#node|short#;file=#file|urlescape#">annotate</a>
79fd7a92f3e2 hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
14 <a href="?f=#node|short#;file=#file|urlescape#;style=raw">raw</a>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
15 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
16
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
17 <h2>#file|escape#</h2>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
18
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
19 <table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
20 <tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
21 <td class="metatag">changeset #rev#:</td>
1410
17703aa4491e hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents: 1370
diff changeset
22 <td><a href="?cs=#node|short#">#node|short#</a></td></tr>
1653
e8a3df8b62b3 hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents: 1650
diff changeset
23 #rename%filerename#
1416
19d2776f1725 hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1411
diff changeset
24 #parent%filerevparent#
1606
ba625c8083d8 - duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents: 1416
diff changeset
25 #child%filerevchild#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
26 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
27 <td class="metatag">author:</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 168
diff changeset
28 <td>#author|obfuscate#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
29 <tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
30 <td class="metatag">date:</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 168
diff changeset
31 <td>#date|date# (#date|age# ago)</td></tr>
359
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 201
diff changeset
32 <tr>
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 201
diff changeset
33 <td class="metatag">permissions:</td>
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 201
diff changeset
34 <td>#permissions|permissions#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
35 </table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
36
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
37 <pre>
976
5d5ab159d197 hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 570
diff changeset
38 #text%fileline#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
39 </pre>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
40
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
41 #footer#