Mercurial > hg
annotate mercurial/templates/gitweb/error.tmpl @ 30308:d500ddae7494
bdiff: don't check border condition in loop
`plast = a + len - 1`. So, this "for" loop iterates from "a" to "plast",
inclusive. So, `p == plast` can only be true on the final iteration
of the loop. So checking for it on every loop iteration is wasteful.
This patch simply decreases the upper bound of the loop by 1 and
adds an explicit check after iteration for the `p == plast` case.
We can't simply add 1 to the initial value for "i" because that
doesn't do the correct thing on empty input strings.
`perfbdiff -m 3041e4d59df2` on the Firefox repo becomes significantly
faster:
! wall 0.072763 comb 0.070000 user 0.070000 sys 0.000000 (best of 100)
! wall 0.053221 comb 0.060000 user 0.060000 sys 0.000000 (best of 100)
For the curious, this code has its origins in 8b067bde6679, which is
the changeset that introduced bdiff.c in 2005.
Also, GNU diffutils is able to perform a similar line-based diff in
under 20ms. So there's likely more perf wins to be found in this code.
One of them is the hashing algorithm. But it looks like mpm spent
some time testing hash collisions in d0c48891dd4a. I'd like to do the
same before switching away from lyhash, just to be on the safe side.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 06 Nov 2016 00:37:50 -0700 |
parents | 32f76eccbced |
children | cb5123eff7d1 |
rev | line source |
---|---|
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6177
diff
changeset
|
1 {header} |
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6177
diff
changeset
|
2 <title>{repo|escape}: Error</title> |
5269
46c5e1ee8aaa
Added support for the Atom syndication format
Robert Bachmann <rbach@rbach.priv.at>
parents:
3363
diff
changeset
|
3 <link rel="alternate" type="application/atom+xml" |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
4 href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/> |
1776 | 5 <link rel="alternate" type="application/rss+xml" |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
6 href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/> |
1776 | 7 </head> |
8 <body> | |
9 | |
10 <div class="page_header"> | |
18258
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
13964
diff
changeset
|
11 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> |
bebb05a7e249
hgweb: add a "URL breadcrumb" to the index and repository pages
Angel Ezquerra <angel.ezquerra at gmail.com>
parents:
13964
diff
changeset
|
12 <a href="/">Mercurial</a> {pathdef%breadcrumb} / error |
1776 | 13 </div> |
14 | |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
15 <div class="page_nav"> |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
16 <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
17 <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
18 <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
19 <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
20 <a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> | |
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
21 <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> | |
25526
32f76eccbced
hgweb: don't point file links at tip hash where it doesn't make sense
Anton Shestakov <av6@dwimlabs.net>
parents:
18526
diff
changeset
|
22 <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> | |
18526
9409aeaafdc1
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names
Thomas Arendsen Hein <thomas@intevation.de>
parents:
18258
diff
changeset
|
23 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> |
13862
4d0a7d70866b
hgweb: format page_nav of gitweb/error.tmpl and add missing links
Yuya Nishihara <yuya@tcha.org>
parents:
9999
diff
changeset
|
24 <br/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
25 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
26 |
3357
7cc0f49d8e5c
gitweb: Add error text to error page
Brendan Cully <brendan@kublai.com>
parents:
3271
diff
changeset
|
27 <div class="page_body"> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
28 <br/> |
5837
2580d418e3f0
Issue #880: Simple misspelling ('occured') in web error message.
Jesse Glick <jesse.glick@sun.com>
parents:
5820
diff
changeset
|
29 <i>An error occurred while processing your request</i><br/> |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 <br/> |
3357
7cc0f49d8e5c
gitweb: Add error text to error page
Brendan Cully <brendan@kublai.com>
parents:
3271
diff
changeset
|
31 {error|escape} |
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
32 </div> |
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
33 |
8427
cebdfdcc3e42
git: use newer template syntax everywhere
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6177
diff
changeset
|
34 {footer} |