Commit Graph

11061 Commits (e529c561f548fa2d277b8cb7c123c3a46a0427a4)

Author SHA1 Message Date
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
intrigeri 18ddf727d1 po: fix interdiction to create pages of type po
... which was broken by the new page_types code.

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 1914ae2fd2)
2009-08-28 07:32:41 -04:00
intrigeri 8064acf87f doc/po: reported bug + patches wrt. created page type
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 13:20:33 +02:00
intrigeri c9301d2c29 po: favor the type of linking page's masterpage on page creation
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 13:12:58 +02:00
intrigeri 1914ae2fd2 po: fix interdiction to create pages of type po
... which was broken by the new page_types code.

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 12:38:07 +02:00
Joey Hess 29e1c8e033 Czech basewiki enabled 2009-08-28 06:13:47 -04:00
Miroslav Kure 11ef522086 Initial Czech translation of basewiki/ 2009-08-28 06:10:10 -04:00
Joey Hess 23f2d53277 merge updates to danish translation from l10n 2009-08-28 06:07:59 -04:00
Joey Hess 588b8951d3 print which remotes are failing 2009-08-27 21:51:06 -04:00
Joey Hess b7a3fbec78 response 2009-08-27 21:36:55 -04:00
Joey Hess 04a8da4f01 mention ignore branch 2009-08-27 21:00:39 -04:00
Joey Hess ff0cb2a7bf Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-08-27 20:19:28 -04:00
Joey Hess d4b4b3d988 avoid fetching tags from random remotes
git makes it too easy to get crap tags into origin
2009-08-27 20:17:38 -04:00
Simon McVittie 545029fe4b Explain my depends-exact branch 2009-08-28 01:13:43 +01:00
Joey Hess 0c1a71896d htmltidy: Return an error message if tidy fails. Closes: #543722
On second^Wthird^Wfourth thought, putting the message into the page seems
better than using stderr.
2009-08-27 16:27:57 -04:00
Joey Hess 18e4fa6539 fix merged 2009-08-27 15:54:44 -04:00
Joey Hess 023c3046c0 Merge commit 'intrigeri/po' 2009-08-27 15:51:55 -04:00
Joey Hess f8ad1bfec4 fix cherry-picked 2009-08-27 15:50:43 -04:00
intrigeri f4583c1524 po: override the title template variable for coherent homepage titling
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 6c0f9c691c)
2009-08-27 15:50:01 -04:00
Joey Hess ffcd97ce52 change cherry-picked; move to discussion 2009-08-27 15:49:12 -04:00
intrigeri 33b18e12c7 po(scan): removed scary comment about only wanting to change the first link
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 3c2bffe21b)
2009-08-27 15:48:02 -04:00
intrigeri eaa782a185 doc/po(self-links): follow-ups
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:38:36 +02:00
intrigeri cdc3576c8d po: do not inject custom bestlink function when po_link_to eq default
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:31:44 +02:00
intrigeri 6bc3206af1 doc/po: follow-up 2009-08-27 20:21:16 +02:00
intrigeri 6c0f9c691c po: override the title template variable for coherent homepage titling
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:19:17 +02:00
intrigeri 7d35d17f95 doc/po: follow-up
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:01:24 +02:00
intrigeri 3c2bffe21b po(scan): removed scary comment about only wanting to change the first link
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 19:59:15 +02:00