Commit Graph

10776 Commits (6646841fa2c659153c44f73c0da846ef9829b8be)

Author SHA1 Message Date
Joey Hess 6646841fa2 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-08-30 14:38:19 -04:00
Amitai Schlair 58cef9c3cf describe the wrapper change 2009-08-30 02:35:38 -04:00
Amitai Schlair 558873131f also need File::ReadBackwards now 2009-08-30 01:31:15 -04:00
Amitai Schlair 0721363a7a bug fixed, to-dos done 2009-08-30 01:26:57 -04:00
Amitai Schlair 6962b34597 This is in my git branch now, no need for a copy of the code here. 2009-08-29 22:17:40 -04:00
Joey Hess 29db15d31c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-08-29 14:01:03 -04:00
intrigeri ef69cb34c3 doc/po(test suite failures): follow-up
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-29 17:25:51 +02:00
http://schmonz.livejournal.com/ 517432273b mod_auth_openid 2009-08-29 10:47:45 -04:00
bremner a0de415ae0 build failure on nearlyfreespeech.net 2009-08-29 07:16:57 -04:00
http://emptty.myopenid.com/ a4c9a8461c Answer to Joey, and justify my text (in the source) 2009-08-29 04:28:01 -04:00
Josh Triplett 9f75d3b1f3 teximg: Make TeX handle preventing unsafe things; remove insufficient blacklist
TeX has configuration options that prevent unsafe things like shell
escapes and insecure file reads/writes.  Turn all of them on.

teximg's regex-based blacklist does not suffice.  For instance:

[[!teximg code="""
\catcode`\%=0
%input{/etc/passwd}
"""]]

Remove the blacklist, since the TeX configuration options seal off the
underlying mechanisms more safely, and the blacklist blocks other TeX
commands that can prove useful.
2009-08-28 23:18:07 -07:00
Joey Hess 44ce9563a3 note that debian-* branches are subject to being rebased 2009-08-29 01:13:24 -04:00
Joey Hess 03449610d6 img: Don't generate new verison of image if it is scaled to be larger in either dimension.
Although imagemagick handles even really large sizes sanely, using a page
file, doing so would just waste time and disk space, since the browser
can be told to resize it larger.
2009-08-28 23:31:53 -04:00
Joey Hess 94727e7fcf merged 2009-08-28 19:49:22 -04:00
Joey Hess 3811c5f559 Merge commit 'intrigeri/po' 2009-08-28 19:48:32 -04:00
Joey Hess ec26a96193 avoid clobbering origsub if checkconfig runs more than once
checkconfig can run more than once in a single ikiwiki run if setup is
building wrappers. That clobbered the origsub value for bestlink, leading
to infinite recursion
2009-08-28 19:15:25 -04:00
Joey Hess 2ba54735ce po test suite failure 2009-08-28 18:34:44 -04:00
furby 25bf32431f 2009-08-28 18:08:16 -04:00
furby 54a3928508 2009-08-28 18:03:28 -04:00
Joey Hess 125c6ec650 <pedant>rename depends_exact to depends_simple
It's not "exact" since case munging has to be done, and I think
"simple" captures the optimisation better.</pedant>

With apologies to smcv, who probably has to rebuild his wiki now.
2009-08-28 15:13:45 -04:00
Joey Hess 4e3a2a370c changelpg 2009-08-28 15:11:21 -04:00
Joey Hess 59ad31c242 Merge commit 'smcv/ready/depends-exact' 2009-08-28 15:10:37 -04:00
Joey Hess 4236eb5f68 response 2009-08-28 15:00:58 -04:00
Joey Hess 1513404600 Merge commit 'smcv/ready/trivia' 2009-08-28 14:45:38 -04:00
http://emptty.myopenid.com/ b6e589c9a4 Introduce myself 2009-08-28 12:22:38 -04:00
http://emptty.myopenid.com/ 79d3bb16ea my first edit to this site, please forgive mistakes 2009-08-28 12:18:30 -04:00
Simon McVittie 54f94e6bc8 Some crude benchmarking on a larger wiki 2009-08-28 16:11:52 +01:00
Simon McVittie a3f4077c36 Merge commit 'origin/master' 2009-08-28 15:55:28 +01:00
Simon McVittie 54b3d55aad Mark as done 2009-08-28 15:50:02 +01:00
Simon McVittie de4dc8befe Updated branch, thanks for the feedback 2009-08-28 15:48:51 +01:00
Simon McVittie 20a38fbf6d Avoid duplicating debug message for building a page due to a dependency
As per Joey's review
2009-08-28 15:42:07 +01:00
Simon McVittie 2a7f3b91d4 Force %depends_exact to lower case, fixing incorrect case-sensitivity 2009-08-28 15:42:04 +01:00
Simon McVittie b6992ec566 Auto-detect "simple dependencies" instead of requiring callers to use add_depends_exact() 2009-08-28 15:41:26 +01:00
intrigeri 6be8746125 doc/po: report problem with link() + propose patch
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 16:38:13 +02:00
intrigeri 646c9a4c95 po: fix link() pagespec when used on translation pages
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 16:34:58 +02:00
Simon McVittie ec2367cfbf Fix typo in dependency debug message 2009-08-28 15:34:35 +01:00
Simon McVittie c80a3cbcfd Add depends_exact: simplified dependency tracking for dependencies on a single page
Let E be the number of dependencies per page of the form "A depends on B and
nothing else", let D be the number of other dependencies per page,
let P be the total number of pages, and let C be the number of changed
pages in a refresh.

This patch should speed up a refresh from O(E*C*P + D*C*P) to
O(C + E*P + D*C*P), assuming that hash lookups are O(1).

In practice, plugins like inline and map produce a lot of these very simple
dependencies, and my album plugin's combination of inline with a large
number of pages causes it to suffer particularly badly.

In testing on a wiki with about 7000 objects (3500 full pages, 3500
images), a full rebuild continued to take about 5:30, and a refresh
after touching about 350 pages and 350 images reduced from 5:30 to 1:30.

As with my previous optimizations, this change will result in downgrades not
working correctly until the wiki is rebuilt.
2009-08-28 15:34:35 +01:00
Simon McVittie d92f767fb7 inline: if using pagenames, don't add a dependency on "page1 or page2 or..."
This is unnecessary and just slows us down (by a factor of 2, in the
pessimal case where every page has an inline with pagenames); it's also
not possible to optimize it into add_depends_exact calls.
2009-08-28 15:34:35 +01:00
Simon McVittie 8b927d4a65 Fix typo in underlay.setup 2009-08-28 15:34:16 +01:00
intrigeri be954ff3cb Merge commit 'upstream/master' into prv/po 2009-08-28 15:57:46 +02:00
intrigeri 3f303cc853 follow-up
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:25:05 +02:00
intrigeri e3b5d70137 doc/po: bug report + patch proposal wrt. inline's post form's rootpage
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:08:02 +02:00
intrigeri e671e72053 po: better rootpage logic for inline's post form
Set rootpage to the non-l10n'd rootpage parameter if it is set,
else to the masterpage of the linking page.

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:00:16 +02:00
intrigeri 53dc18ec2b Revert "po: keep masterpage as the rootpage for inline's post form"
This reverts commit cf43ae5a1f, which actually
only works when a rootpage parameter is set. A more complete fix will be
written soon.
2009-08-28 14:47:11 +02:00
intrigeri a06b8590ce Merge commit 'upstream/master' into prv/po 2009-08-28 14:23:38 +02:00
intrigeri cf43ae5a1f po: keep masterpage as the rootpage for inline's post form
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 14:22:36 +02:00
intrigeri 72ac9821e5 inline: moved rootpage logic to a function
The po plugin's injected bestlink must do something special when called by this
exact part of inline's code.

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 14:22:23 +02:00
Joey Hess c68413dcce Merge commit 'intrigeri/po' 2009-08-28 07:40:46 -04:00
Joey Hess cc6000f0b9 both changes picked 2009-08-28 07:34:09 -04:00
intrigeri 5136c22eed po: favor the type of linking page's masterpage on page creation
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 07:33:53 -04:00