Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/search.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 | 1196998c62e3 |
children |
rev | line source |
---|---|
538 | 1 #header# |
2 <title>#repo|escape#: searching for #query|escape#</title> | |
3 </head> | |
4 <body> | |
5 | |
6 <div class="buttons"> | |
3363
ce8f31e0b3b8
hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3362
diff
changeset
|
7 <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:
3362
diff
changeset
|
8 <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:
3362
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:
3362
diff
changeset
|
10 <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> |
4470
1196998c62e3
Add archive download links to hgweb search template
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3363
diff
changeset
|
11 #archives%archiveentry# |
538 | 12 </div> |
13 | |
14 <h2>searching for #query|escape#</h2> | |
15 | |
16 <form> | |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
17 {sessionvars%hiddenformentry} |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
18 <p> |
538 | 19 search: |
20 <input name="rev" type="text" width="30" value="#query|escape#"> | |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
21 </p> |
538 | 22 </form> |
23 | |
24 #entries# | |
25 | |
26 <form> | |
3362
887da2247b57
hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3272
diff
changeset
|
27 {sessionvars%hiddenformentry} |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
28 <p> |
538 | 29 search: |
1441
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
30 <input name="rev" type="text" width="30" value="#query|escape#"> |
cbc36ad70945
hgweb: a couple of fixes on search page
TK Soh <teekaysoh@yahoo.com>
parents:
1432
diff
changeset
|
31 </p> |
538 | 32 </form> |
33 | |
34 #footer# |