annotate templates/gitweb/search.tmpl @ 6268:7e4f66fe964b

merge: notice uncommited copies (issue1000) As mentioned in msg5349 in issue988, "hg update" doesn't take into account uncommitted copies. To reproduce: ---------------- hg init repo cd repo touch foo hg ci -Am 'add foo' echo >> foo hg ci -m 'change foo' hg up -C 0 hg mv foo bar HGMERGE=false thg --debug -y update -------------------------- A similar problem happens with hg merge --force. I'm attaching a possible patch.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 11:01:31 -0500
parents 673d8a6bc709
children 7f58dec6aeb7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
1 #header#
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
2 <title>#repo|escape#: Search</title>
5269
46c5e1ee8aaa Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents: 4469
diff changeset
3 <link rel="alternate" type="application/atom+xml"
5820
3a1ffc1da32c Fixed numerous XHTML problems that caused validation errors and warnings.
Kevin Christen <kevin.christen@gmail.com>
parents: 5269
diff changeset
4 href="{url}atom-log" title="Atom feed for #repo|escape#"/>
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
5 <link rel="alternate" type="application/rss+xml"
5820
3a1ffc1da32c Fixed numerous XHTML problems that caused validation errors and warnings.
Kevin Christen <kevin.christen@gmail.com>
parents: 5269
diff changeset
6 href="{url}rss-log" title="RSS feed for #repo|escape#"/>
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
7 </head>
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
8 <body>
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
9
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
10 <div class="page_header">
5820
3a1ffc1da32c Fixed numerous XHTML problems that caused validation errors and warnings.
Kevin Christen <kevin.christen@gmail.com>
parents: 5269
diff changeset
11 <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / search
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
12
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
13 <form action="{url}log">
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
14 {sessionvars%hiddenformentry}
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
15 <div class="search">
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
16 <input type="text" name="rev" value="#query|escape#" />
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
17 </div>
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
18 </form>
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
19 </div>
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
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">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3362
diff changeset
22 <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: 3362
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: 3362
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: 3362
diff changeset
25 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
6177
673d8a6bc709 Renamed "manifest" to "files" in web templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5820
diff changeset
26 <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
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
4469
8af65bc092b0 gitweb: Fixed-up search template
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 3363
diff changeset
30 <div class="title">searching for #query|escape#</div>
1572
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
31
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
32 #entries#
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
33
385b8872b8e3 [hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff changeset
34 #footer#