Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/manifest.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 | 6e0f05f6f68d |
children |
rev | line source |
---|---|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 #header# |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
2 <title>#repo|escape#: Manifest</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
4538
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:
4538
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:
3311
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> / manifest |
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:
3311
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:
3311
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:
3311
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:
3311
diff
changeset
|
18 <a href="{url}tags{sessionvars%urlparameter}">tags</a> | |
3270
36fa5db79dd5
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents:
3226
diff
changeset
|
19 manifest | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
20 <a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> #archives%archiveentry#<br/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
21 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
22 |
4538
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4457
diff
changeset
|
23 <div class="title">#path|escape# <span class="logtags">{branches%branchtag}{tags%tagtag}</span></div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
24 <table cellspacing="0"> |
4457
e19d9b1223ee
hgweb: manifest: pass parity for the '[up]' link
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4452
diff
changeset
|
25 <tr class="parity#upparity#"> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
26 <td style="font-family:monospace">drwxr-xr-x</td> |
3311
0708bdb4987a
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com>
parents:
3270
diff
changeset
|
27 <td style="font-family:monospace"></td> |
5270
6e0f05f6f68d
hgweb: Show date of last change for each file in manifest
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5266
diff
changeset
|
28 <td style="font-family:monospace"></td> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
29 <td><a href="{url}file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a></td> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 <td class="link"> </td> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 </tr> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
32 #dentries%manifestdirentry# |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
33 #fentries%manifestfileentry# |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
34 </table> |
4452
862dc0c020ad
gitweb: Fixed manifest template opening an extra div tag
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3363
diff
changeset
|
35 |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 #footer# |