Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/gitweb/summary.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# |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
2 <title>#repo|escape#: Summary</title> |
5266
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
4710
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:
4710
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:
3246
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:
3355
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> / summary |
4467
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
12 |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
13 <form action="{url}log"> |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
14 {sessionvars%hiddenformentry} |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
15 <div class="search"> |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
16 <input type="text" name="rev" /> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
17 </div> |
4467
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
18 </form> |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
19 </div> |
d189b19936ec
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4451
diff
changeset
|
20 |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
21 <div class="page_nav"> |
3270
36fa5db79dd5
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com>
parents:
3246
diff
changeset
|
22 summary | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3355
diff
changeset
|
23 <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:
3355
diff
changeset
|
24 <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:
3355
diff
changeset
|
25 <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:
3355
diff
changeset
|
26 <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a>#archives%archiveentry# |
2683
8a798185809d
[hgweb] Fixed up gitweb templates
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
2011
diff
changeset
|
27 <br/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
28 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
29 |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 <div class="title"> </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 <table cellspacing="0"> |
2011
b4df4687a78a
don't overquote description on gitweb summary page (issue 184)
TK Soh <teekaysoh@yahoo.com>
parents:
1652
diff
changeset
|
32 <tr><td>description</td><td>#desc#</td></tr> |
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:
1577
diff
changeset
|
33 <tr><td>owner</td><td>#owner|escape#</td></tr> |
3355
c10eacad7171
gitweb: fix last change field in summary
Brendan Cully <brendan@kublai.com>
parents:
3270
diff
changeset
|
34 <tr><td>last change</td><td>#lastchange|rfc822date#</td></tr> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
35 </table> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 |
4710
1aba0b752847
gitweb: do not mix shortlog and changelog in summary page.
Markus F.X.J. Oberhumer <markus@oberhumer.com>
parents:
4467
diff
changeset
|
37 <div><a class="title" href="{url}shortlog{sessionvars%urlparameter}">changes</a></div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
38 <table cellspacing="0"> |
1652
f910437af806
unbreak templates/summary-gitweb.tmpl
Peter van Dijk <peter@dataloss.nl>
parents:
1650
diff
changeset
|
39 #shortlog# |
4710
1aba0b752847
gitweb: do not mix shortlog and changelog in summary page.
Markus F.X.J. Oberhumer <markus@oberhumer.com>
parents:
4467
diff
changeset
|
40 <tr class="light"><td colspan="4"><a class="list" href="{url}shortlog{sessionvars%urlparameter}">...</a></td></tr> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
41 </table> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
42 |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3355
diff
changeset
|
43 <div><a class="title" href="{url}tags{sessionvars%urlparameter}">tags</a></div> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
44 <table cellspacing="0"> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
45 #tags# |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3355
diff
changeset
|
46 <tr class="light"><td colspan="3"><a class="list" href="{url}tags{sessionvars%urlparameter}">...</a></td></tr> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
47 </table> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
48 |
4300
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
49 <div><a class="title" href="#">branches</a></div> |
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
50 <table cellspacing="0"> |
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
51 {branches%branchentry} |
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
52 <tr class="light"> |
4451
94a167c3c116
gitweb: Fix summary page ellipsis line colspans
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
4301
diff
changeset
|
53 <td colspan="4"><a class="list" href="#">...</a></td> |
4300
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
54 </tr> |
05d15c456fb2
hgweb: display named branches in gitweb-style summary page
greg@maptuit.com
parents:
3493
diff
changeset
|
55 </table> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
56 #footer# |