Josh Triplett [Sat, 29 Aug 2009 06:07:27 +0000 (23:07 -0700)]
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.
Joey Hess [Sat, 29 Aug 2009 03:23:06 +0000 (23:23 -0400)]
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.
Joey Hess [Fri, 28 Aug 2009 23:49:22 +0000 (19:49 -0400)]
merged
Joey Hess [Fri, 28 Aug 2009 23:48:32 +0000 (19:48 -0400)]
Merge commit 'intrigeri/po'
Joey Hess [Fri, 28 Aug 2009 23:15:25 +0000 (19:15 -0400)]
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
Joey Hess [Fri, 28 Aug 2009 22:22:11 +0000 (18:22 -0400)]
po test suite failure
furby [Fri, 28 Aug 2009 22:08:16 +0000 (18:08 -0400)]
furby [Fri, 28 Aug 2009 22:03:28 +0000 (18:03 -0400)]
Joey Hess [Fri, 28 Aug 2009 19:13:45 +0000 (15:13 -0400)]
<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.
Joey Hess [Fri, 28 Aug 2009 19:11:21 +0000 (15:11 -0400)]
changelpg
Joey Hess [Fri, 28 Aug 2009 19:10:37 +0000 (15:10 -0400)]
Merge commit 'smcv/ready/depends-exact'
Joey Hess [Fri, 28 Aug 2009 19:00:58 +0000 (15:00 -0400)]
response
Joey Hess [Fri, 28 Aug 2009 18:45:38 +0000 (14:45 -0400)]
Merge commit 'smcv/ready/trivia'
http://emptty.myopenid.com/ [Fri, 28 Aug 2009 16:22:38 +0000 (12:22 -0400)]
Introduce myself
http://emptty.myopenid.com/ [Fri, 28 Aug 2009 16:18:30 +0000 (12:18 -0400)]
my first edit to this site, please forgive mistakes
Simon McVittie [Fri, 28 Aug 2009 15:11:52 +0000 (16:11 +0100)]
Some crude benchmarking on a larger wiki
Simon McVittie [Fri, 28 Aug 2009 14:55:28 +0000 (15:55 +0100)]
Merge commit 'origin/master'
Simon McVittie [Fri, 28 Aug 2009 14:50:02 +0000 (15:50 +0100)]
Mark as done
Simon McVittie [Fri, 28 Aug 2009 14:48:51 +0000 (15:48 +0100)]
Updated branch, thanks for the feedback
Simon McVittie [Fri, 28 Aug 2009 14:28:52 +0000 (15:28 +0100)]
Avoid duplicating debug message for building a page due to a dependency
As per Joey's review
Simon McVittie [Fri, 28 Aug 2009 14:22:07 +0000 (15:22 +0100)]
Force %depends_exact to lower case, fixing incorrect case-sensitivity
Simon McVittie [Fri, 28 Aug 2009 14:41:26 +0000 (15:41 +0100)]
Auto-detect "simple dependencies" instead of requiring callers to use add_depends_exact()
intrigeri [Fri, 28 Aug 2009 14:38:13 +0000 (16:38 +0200)]
doc/po: report problem with link() + propose patch
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 14:34:58 +0000 (16:34 +0200)]
po: fix link() pagespec when used on translation pages
Signed-off-by: intrigeri <intrigeri@boum.org>
Simon McVittie [Fri, 28 Aug 2009 01:11:26 +0000 (02:11 +0100)]
Fix typo in dependency debug message
Simon McVittie [Thu, 27 Aug 2009 22:25:58 +0000 (23:25 +0100)]
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.
Simon McVittie [Thu, 27 Aug 2009 22:30:41 +0000 (23:30 +0100)]
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.
Simon McVittie [Fri, 28 Aug 2009 14:32:58 +0000 (15:32 +0100)]
Fix typo in underlay.setup
intrigeri [Fri, 28 Aug 2009 13:57:46 +0000 (15:57 +0200)]
Merge commit 'upstream/master' into prv/po
intrigeri [Fri, 28 Aug 2009 13:25:05 +0000 (15:25 +0200)]
follow-up
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 12:41:32 +0000 (14:41 +0200)]
doc/po: bug report + patch proposal wrt. inline's post form's rootpage
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 13:00:16 +0000 (15:00 +0200)]
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>
intrigeri [Fri, 28 Aug 2009 12:47:11 +0000 (14:47 +0200)]
Revert "po: keep masterpage as the rootpage for inline's post form"
This reverts commit
cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually
only works when a rootpage parameter is set. A more complete fix will be
written soon.
intrigeri [Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)]
Merge commit 'upstream/master' into prv/po
intrigeri [Fri, 28 Aug 2009 11:57:15 +0000 (13:57 +0200)]
po: keep masterpage as the rootpage for inline's post form
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 11:56:03 +0000 (13:56 +0200)]
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>
Joey Hess [Fri, 28 Aug 2009 11:40:46 +0000 (07:40 -0400)]
Merge commit 'intrigeri/po'
Joey Hess [Fri, 28 Aug 2009 11:34:09 +0000 (07:34 -0400)]
both changes picked
intrigeri [Fri, 28 Aug 2009 11:12:58 +0000 (13:12 +0200)]
po: favor the type of linking page's masterpage on page creation
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 10:38:07 +0000 (12:38 +0200)]
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
1914ae2fd24e1e8021404eae847d70c710f8542d)
intrigeri [Fri, 28 Aug 2009 11:19:48 +0000 (13:19 +0200)]
doc/po: reported bug + patches wrt. created page type
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 11:12:58 +0000 (13:12 +0200)]
po: favor the type of linking page's masterpage on page creation
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Fri, 28 Aug 2009 10:38:07 +0000 (12:38 +0200)]
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>
Joey Hess [Fri, 28 Aug 2009 10:12:05 +0000 (06:12 -0400)]
Czech basewiki enabled
Miroslav Kure [Fri, 28 Aug 2009 10:08:46 +0000 (06:08 -0400)]
Initial Czech translation of basewiki/
Joey Hess [Fri, 28 Aug 2009 10:07:59 +0000 (06:07 -0400)]
merge updates to danish translation from l10n
Joey Hess [Fri, 28 Aug 2009 01:51:06 +0000 (21:51 -0400)]
print which remotes are failing
Joey Hess [Fri, 28 Aug 2009 01:36:55 +0000 (21:36 -0400)]
response
Joey Hess [Fri, 28 Aug 2009 01:00:39 +0000 (21:00 -0400)]
mention ignore branch
Joey Hess [Fri, 28 Aug 2009 00:19:28 +0000 (20:19 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Fri, 28 Aug 2009 00:16:57 +0000 (20:16 -0400)]
avoid fetching tags from random remotes
git makes it too easy to get crap tags into origin
Simon McVittie [Fri, 28 Aug 2009 00:13:43 +0000 (01:13 +0100)]
Explain my depends-exact branch
Joey Hess [Thu, 27 Aug 2009 20:27:57 +0000 (16:27 -0400)]
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.
Joey Hess [Thu, 27 Aug 2009 19:54:44 +0000 (15:54 -0400)]
fix merged
Joey Hess [Thu, 27 Aug 2009 19:51:55 +0000 (15:51 -0400)]
Merge commit 'intrigeri/po'
Joey Hess [Thu, 27 Aug 2009 19:50:43 +0000 (15:50 -0400)]
fix cherry-picked
intrigeri [Thu, 27 Aug 2009 18:19:17 +0000 (20:19 +0200)]
po: override the title template variable for coherent homepage titling
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit
6c0f9c691c3df3a2ec30dec626c997623568a400)
Joey Hess [Thu, 27 Aug 2009 19:49:12 +0000 (15:49 -0400)]
change cherry-picked; move to discussion
intrigeri [Thu, 27 Aug 2009 17:59:15 +0000 (19:59 +0200)]
po(scan): removed scary comment about only wanting to change the first link
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit
3c2bffe21b91684971155ab41b15dacc515b2fc5)
intrigeri [Thu, 27 Aug 2009 18:38:36 +0000 (20:38 +0200)]
doc/po(self-links): follow-ups
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Thu, 27 Aug 2009 18:31:44 +0000 (20:31 +0200)]
po: do not inject custom bestlink function when po_link_to eq default
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Thu, 27 Aug 2009 18:21:16 +0000 (20:21 +0200)]
doc/po: follow-up
intrigeri [Thu, 27 Aug 2009 18:19:17 +0000 (20:19 +0200)]
po: override the title template variable for coherent homepage titling
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Thu, 27 Aug 2009 18:01:24 +0000 (20:01 +0200)]
doc/po: follow-up
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Thu, 27 Aug 2009 17:59:15 +0000 (19:59 +0200)]
po(scan): removed scary comment about only wanting to change the first link
Signed-off-by: intrigeri <intrigeri@boum.org>
intrigeri [Thu, 27 Aug 2009 17:56:37 +0000 (19:56 +0200)]
Merge commit 'upstream/master' into prv/po
Joey Hess [Thu, 27 Aug 2009 17:10:31 +0000 (13:10 -0400)]
followups
Joey Hess [Thu, 27 Aug 2009 16:57:04 +0000 (12:57 -0400)]
cherry-picked fix for recentchanges links
intrigeri [Wed, 26 Aug 2009 05:56:33 +0000 (07:56 +0200)]
po: do not beautify urls on the recentchanges page
... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.
It is better in this one case if the link goes direct to the translated version
of the page.
(cherry picked from commit
496e8523c6706d096f1b794e3f3ba5dd2fa260f3)
Joey Hess [Thu, 27 Aug 2009 16:56:24 +0000 (12:56 -0400)]
unsure if this patch is enough
Joey Hess [Thu, 27 Aug 2009 16:41:25 +0000 (12:41 -0400)]
forwarded
intrigeri [Thu, 27 Aug 2009 01:19:55 +0000 (21:19 -0400)]
initial patch proposal
https://infosoph.myopenid.com/ [Wed, 26 Aug 2009 18:39:25 +0000 (14:39 -0400)]
Forgot to mention I have multimarkdown enabled
Joey Hess [Wed, 26 Aug 2009 17:24:51 +0000 (13:24 -0400)]
htmltidy: Print a warning message if tidy fails. Closes: #543722
Joey Hess [Wed, 26 Aug 2009 17:11:55 +0000 (13:11 -0400)]
close; multimarkdown not enabled by default
Joey Hess [Wed, 26 Aug 2009 17:09:43 +0000 (13:09 -0400)]
translation of directives
Joey Hess [Wed, 26 Aug 2009 17:05:46 +0000 (13:05 -0400)]
typo
Joey Hess [Wed, 26 Aug 2009 17:05:29 +0000 (13:05 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Joey Hess [Wed, 26 Aug 2009 17:04:09 +0000 (13:04 -0400)]
fix emphasis examples to actually work
https://infosoph.myopenid.com/ [Wed, 26 Aug 2009 14:25:48 +0000 (10:25 -0400)]
initial report
martin [Wed, 26 Aug 2009 13:59:39 +0000 (09:59 -0400)]
suggestion
intrigeri [Wed, 26 Aug 2009 06:00:48 +0000 (02:00 -0400)]
po: more TODO items comments and patches
intrigeri [Wed, 26 Aug 2009 05:56:33 +0000 (07:56 +0200)]
po: do not beautify urls on the recentchanges page
... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.
It is better in this one case if the link goes direct to the translated version
of the page.
intrigeri [Wed, 26 Aug 2009 05:41:55 +0000 (01:41 -0400)]
po: commenting some TODO items
intrigeri [Wed, 26 Aug 2009 05:05:07 +0000 (01:05 -0400)]
po: maybe fixed self links
intrigeri [Wed, 26 Aug 2009 05:02:29 +0000 (07:02 +0200)]
po: (hopefully) fixed WikiLink to self with po_link_to=default
Joey Hess [Tue, 25 Aug 2009 21:46:15 +0000 (17:46 -0400)]
don't use pagespec_match_list
This should be more efficient than pagespec_match_list since it short-circuits
after the first match is found.
The other problem with using pagespec_match_list here is it may throw an
error if a bad or failing pagespec somehow got into the dependencies.
Joey Hess [Tue, 25 Aug 2009 21:27:32 +0000 (17:27 -0400)]
changelog and news file, also make postinst rebuild on upgrade
Joey Hess [Tue, 25 Aug 2009 21:21:19 +0000 (17:21 -0400)]
Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
Joey Hess [Tue, 25 Aug 2009 21:18:39 +0000 (17:18 -0400)]
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Simon McVittie [Tue, 25 Aug 2009 21:18:52 +0000 (22:18 +0100)]
reply
Joey Hess [Tue, 25 Aug 2009 21:11:29 +0000 (17:11 -0400)]
Revert "Allow add_depends to take an arrayref"
This reverts commit
e4cd168ebedd95585290c97ff42234344bfed46c.
There was no benefit to this change.
Joey Hess [Tue, 25 Aug 2009 21:09:52 +0000 (17:09 -0400)]
Merge commit 'smcv/ready/optimize-depends'
Joey Hess [Tue, 25 Aug 2009 17:39:33 +0000 (13:39 -0400)]
Fix example blog's tags/life to not have a broken PageSpec. Closes: #543510
Joey Hess [Tue, 25 Aug 2009 02:10:12 +0000 (22:10 -0400)]
better analysis of why the depends keep growing
Joey Hess [Tue, 25 Aug 2009 01:54:22 +0000 (21:54 -0400)]
at this point I'm down to deciding which specific commits to merge and
which were dead ends
Simon McVittie [Mon, 24 Aug 2009 23:45:28 +0000 (00:45 +0100)]
Respond with benchmarks and an updated branch
Simon McVittie [Sat, 1 Aug 2009 11:43:37 +0000 (12:43 +0100)]
Indicate that pagespec_merge() is no longer needed (much rejoicing?)
Simon McVittie [Sat, 25 Jul 2009 19:04:04 +0000 (20:04 +0100)]
Remove now-unused function pagespec_merge
Now that dependencies are a list of pagespecs with an implicit "or"
operation, there's no need to try to merge pagespecs under normal use.
ikiwiki-transition contains the only use of the function, so move
it there rather than deleting it entirely (it's used to concatenate all
admins' lists of locked pages).
Simon McVittie [Sat, 1 Aug 2009 11:43:04 +0000 (12:43 +0100)]
Mark "should optimise pagespecs" as done