Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filelog.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 | 46c5e1ee8aaa |
children |
rev | line source |
---|---|
142 | 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:
1433
diff
changeset
|
2 <title>#repo|escape#: #file|escape# history</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3406
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:
3406
diff
changeset
|
4 href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#"> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
5 <link rel="alternate" type="application/rss+xml" |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3206
diff
changeset
|
6 href="#url#rss-log/tip/#file|urlescape#" title="RSS feed for #repo|escape#:#file#"> |
661
148f642d1f8e
Add rss tag in the changelog/filelog html template.
kreijack@inwind.REMOVEME.it
parents:
599
diff
changeset
|
7 </head> |
142 | 8 </head> |
138 | 9 <body> |
10 | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
11 <div class="buttons"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
12 <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:
3272
diff
changeset
|
13 <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:
3272
diff
changeset
|
14 <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:
3272
diff
changeset
|
15 <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> |
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
16 <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> |
3264
d1aa83f199ef
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents:
3206
diff
changeset
|
17 <a type="application/rss+xml" href="#url#rss-log/tip/#file|urlescape#">rss</a> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3406
diff
changeset
|
18 <a type="application/atom+xml" href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#">atom</a> |
142 | 19 </div> |
138 | 20 |
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:
1433
diff
changeset
|
21 <h2>#file|escape# revision history</h2> |
138 | 22 |
3406
03e7e8958a27
hgweb: hoist changenav up, and use it in the filelog
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
23 <p>navigate: <small class="navigate">{nav%filenaventry}</small></p> |
03e7e8958a27
hgweb: hoist changenav up, and use it in the filelog
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
24 |
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
661
diff
changeset
|
25 #entries%filelogentry# |
138 | 26 |
142 | 27 #footer# |