aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
Commit message (Collapse)AuthorAge
* Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-08-30
|\
| * teximg: Make TeX handle preventing unsafe things; remove insufficient blacklistJosh Triplett2009-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * img: Don't generate new verison of image if it is scaled to be larger in ↵Joey Hess2009-08-28
| | | | | | | | | | | | | | | | 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.
| * Merge commit 'intrigeri/po'Joey Hess2009-08-28
| |\
| | * po: fix link() pagespec when used on translation pagesintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * po: better rootpage logic for inline's post formintrigeri2009-08-28
| | | | | | | | | | | | | | | | | | | | | 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>
| | * Revert "po: keep masterpage as the rootpage for inline's post form"intrigeri2009-08-28
| | | | | | | | | | | | | | | | | | This reverts commit cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually only works when a rootpage parameter is set. A more complete fix will be written soon.
| | * po: keep masterpage as the rootpage for inline's post formintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * inline: moved rootpage logic to a functionintrigeri2009-08-28
| | | | | | | | | | | | | | | | | | | | | 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>
| | * po: favor the type of linking page's masterpage on page creationintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * po: fix interdiction to create pages of type pointrigeri2009-08-28
| | | | | | | | | | | | | | | | | | ... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org>
| * | avoid clobbering origsub if checkconfig runs more than onceJoey Hess2009-08-28
| | | | | | | | | | | | | | | | | | 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
| * | <pedant>rename depends_exact to depends_simpleJoey Hess2009-08-28
| | | | | | | | | | | | | | | | | | | | | 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.
| * | Avoid duplicating debug message for building a page due to a dependencySimon McVittie2009-08-28
| | | | | | | | | | | | As per Joey's review
| * | Force %depends_exact to lower case, fixing incorrect case-sensitivitySimon McVittie2009-08-28
| | |
| * | Fix typo in dependency debug messageSimon McVittie2009-08-28
| | |
| * | Add depends_exact: simplified dependency tracking for dependencies on a ↵Simon McVittie2009-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | inline: if using pagenames, don't add a dependency on "page1 or page2 or..."Simon McVittie2009-08-28
| | | | | | | | | | | | | | | | | | 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.
| * | po: favor the type of linking page's masterpage on page creationintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * | po: fix interdiction to create pages of type pointrigeri2009-08-28
| |/ | | | | | | | | | | | | ... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org> (cherry picked from commit 1914ae2fd24e1e8021404eae847d70c710f8542d)
| * htmltidy: Return an error message if tidy fails. Closes: #543722Joey Hess2009-08-27
| | | | | | | | | | On second^Wthird^Wfourth thought, putting the message into the page seems better than using stderr.
| * po: do not inject custom bestlink function when po_link_to eq defaultintrigeri2009-08-27
| | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * po: override the title template variable for coherent homepage titlingintrigeri2009-08-27
| | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * po(scan): removed scary comment about only wanting to change the first linkintrigeri2009-08-27
| | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * Merge commit 'upstream/master' into prv/pointrigeri2009-08-27
| |\
| | * po: do not beautify urls on the recentchanges pageintrigeri2009-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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)
| | * htmltidy: Print a warning message if tidy fails. Closes: #543722Joey Hess2009-08-26
| | |
| * | po: do not beautify urls on the recentchanges pageintrigeri2009-08-26
| | | | | | | | | | | | | | | | | | | | | | | | ... 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.
| * | po: (hopefully) fixed WikiLink to self with po_link_to=defaultintrigeri2009-08-26
| |/
| * don't use pagespec_match_listJoey Hess2009-08-25
| | | | | | | | | | | | | | | | 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.
| * Revert "Allow add_depends to take an arrayref"Joey Hess2009-08-25
| | | | | | | | | | | | This reverts commit e4cd168ebedd95585290c97ff42234344bfed46c. There was no benefit to this change.
| * use pagespec_match_listSimon McVittie2009-08-25
| |
| * Allow add_depends to take an arrayrefSimon McVittie2009-08-25
| |
| * Use a hash to de-duplicate dependenciesSimon McVittie2009-08-25
| |
| * calendar, inline, map: don't pre-join dependenciesSimon McVittie2009-08-24
| | | | | | | | | | | | The new dependency handling works better (eliminates more duplicates) if dependencies are split up. On the same wiki mentioned in the previous commit, this saves about a second (i.e. 4%) on the same test.
| * Optimize the dependencies listSimon McVittie2009-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a large wiki you can spend a lot of time reading through large lists of dependencies to see whether files need to be rebuilt (album, with its one-page-per-photo arrangement, suffers particularly badly from this). The dependency list is currently a single pagespec, but it's not used like a normal pagespec - in practice, it's a list of pagespecs joined with the "or" operator. Accordingly, change it to be stored as a list of pagespecs. On a wiki with many tagged photo albums, this reduces the time to refresh after `touch tags/*.mdwn` from about 31 to 25 seconds. Getting the benefit of this change on an existing wiki requires a rebuild.
| * po: Fixed to run rcs_add ralative to srcdir.Joey Hess2009-08-19
| |
| * use pagespec_match_list for feedpagesJoey Hess2009-08-16
| | | | | | | | | | | | | | This is both faster, and propigates any error in processing the feedpages pagespec out to display on the page. Which may have been why I didn't use it before, but currently seems like a good thing to do, since it explains why your feeds are empty..
| * po: Better fix for missing underlay translation problem.Joey Hess2009-08-15
| | | | | | | | | | | | | | | | If a page is taken from the underlay, and one of the specified languages does not have po files in the underlay, it would create a broken link to the translated version of the page for that language. With this change, there's no broken link.
| * replace N/A with 0Joey Hess2009-08-15
| | | | | | | | | | | | I think the N/A was not intended to be visible, but it can show up as the percent translated to a language. This happens if the page is located in an underlay, and not translated to the language in any other underlay.
| * update for consistencyJoey Hess2009-08-15
| |
| * indentationJoey Hess2009-08-15
| |
| * meta: depend on absolute page name, not relativeSimon McVittie2009-08-15
| | | | | | | | | | | | Previously, [[!meta redir="foo"]] on bar, where bar/foo exists, would depend on "foo" (which matches nothing, probably) rather than "bar/foo". (cherry picked from commit f27ec09b72f886415e63fe394e18d9c3cb3913bf)
| * img: depend on absolute page name, not relativeSimon McVittie2009-08-15
| | | | | | | | | | | | | | Previously, [[!img bar.jpg]] on foo, where foo/bar.jpg exists, would get a dependency equivalent to "glob(bar.jpg)" (which might not match anything), rather than the correct "glob(foo/bar.jpg)". (cherry picked from commit 85b2ec49ecd12dd23e5c432933457a72744ce7cb)
| * optimise brokenlinks by gathering the data when calculating backlinksJoey Hess2009-08-14
| | | | | | | | | | | | | | | | | | | | During backlink calulation, all links are examined and broken links can be detected for free, so store a list of broken links and have brokenlinks use it. Exposing the %brokenlinks structure is a bit ugly, but the speedup seems worth it: Around 1 second for wikis the size of the doc wiki that use brokenlinks.
| * orphans: Reuse backlinks infoJoey Hess2009-08-14
| | | | | | | | | | This plugin was building essentially the same data that is built to handle backlinks, so reuse that as an optimisation.
| * po: use discussionpage config settingJoey Hess2009-08-13
| | | | | | | | | | This was tricky. $links{$page/discussion} must be checked; with it in lowercase.
| * Add discussionpage configuration settingJoey Hess2009-08-13
| | | | | | | | | | | | By adding this setting, we get both more configurability, and a minor optimisation too, since gettext does not need to be called continually to get the Discussion value.
| * optimise gettext callsJoey Hess2009-08-13
| |
* | Only examine argv if the VCS is cvs.Amitai Schlair2009-08-30
| |