Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/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 |
---|---|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 #header# |
1668
586b50294ea8
[hgweb] Added rename information to gitweb templates & misc cleanups
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1650
diff
changeset
|
2 <title>#repo|escape#: File revisions</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
4459
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:
4459
diff
changeset
|
4 href="{url}atom-log" title="Atom feed for #repo|escape#"> |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
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#"> |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
7 </head> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
8 <body> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
9 |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
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 revisions |
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 |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
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}/#file|urlescape#{sessionvars%urlparameter}">file</a> | |
3270
36fa5db79dd5
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents:
3226
diff
changeset
|
20 revisions | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3350
diff
changeset
|
21 <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
|
22 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | |
4458
2ee0e935f86d
gitweb: file log template: removed excesive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3406
diff
changeset
|
23 <a href="{url}rss-log/#node|short#/#file|urlescape#">rss</a> |
3406
03e7e8958a27
hgweb: hoist changenav up, and use it in the filelog
Brendan Cully <brendan@kublai.com>
parents:
3363
diff
changeset
|
24 <br/> |
4458
2ee0e935f86d
gitweb: file log template: removed excesive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3406
diff
changeset
|
25 {nav%filenaventry} |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
26 </div> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
27 |
2012
d07c322e0033
add missing filename title to gitweb's filelog page
TK Soh <teekaysoh@yahoo.com>
parents:
1668
diff
changeset
|
28 <div class="title" >#file|urlescape#</div> |
d07c322e0033
add missing filename title to gitweb's filelog page
TK Soh <teekaysoh@yahoo.com>
parents:
1668
diff
changeset
|
29 |
1576
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
30 <table> |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
31 #entries%filelogentry# |
145cc9f68c05
File log and some FIXMEs
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1572
diff
changeset
|
32 </table> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
33 |
4459
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
34 <div class="page_nav"> |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
35 {nav%filenaventry} |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
36 </div> |
717b96751431
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4458
diff
changeset
|
37 |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
38 #footer# |