Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/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 |
---|---|
142 | 1 #header# |
3205 | 2 <title>#repo|escape#: manifest for changeset #node|short#</title> |
142 | 3 </head> |
138 | 4 <body> |
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"> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
7 <a href="#url#log/#rev#{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
|
8 <a href="#url#shortlog/#rev#{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
|
9 <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:
3311
diff
changeset
|
10 <a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1410
diff
changeset
|
11 #archives%archiveentry# |
142 | 12 </div> |
138 | 13 |
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:
1498
diff
changeset
|
14 <h2>manifest for changeset #node|short#: #path|escape#</h2> |
138 | 15 |
359 | 16 <table cellpadding="0" cellspacing="0"> |
4457
e19d9b1223ee
hgweb: manifest: pass parity for the '[up]' link
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3363
diff
changeset
|
17 <tr class="parity#upparity#"> |
359 | 18 <td><tt>drwxr-xr-x</tt> |
3311
0708bdb4987a
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com>
parents:
3272
diff
changeset
|
19 <td> |
5270
6e0f05f6f68d
hgweb: Show date of last change for each file in manifest
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4457
diff
changeset
|
20 <td> |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3311
diff
changeset
|
21 <td><a href="#url#file/#node|short##up|urlescape#{sessionvars%urlparameter}">[up]</a> |
3311
0708bdb4987a
hgweb: add file sizes to manifest browsing
Matt Mackall <mpm@selenic.com>
parents:
3272
diff
changeset
|
22 </tr> |
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
23 #dentries%manifestdirentry# |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
377
diff
changeset
|
24 #fentries%manifestfileentry# |
359 | 25 </table> |
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
26 #footer# |