From: Joey Hess Date: Mon, 29 Mar 2010 16:18:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100403~62 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0411319009237c4aea48de78945388d019fc21c;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info Conflicts: doc/todo/allow_site-wide_meta_definitions.mdwn --- b0411319009237c4aea48de78945388d019fc21c diff --cc doc/todo/allow_site-wide_meta_definitions.mdwn index e4638f94b,be66db99d..704cb2c64 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@@ -211,21 -183,5 +211,24 @@@ definitions essentially >>> ikiwiki for the break, and now I've returned to watching recentchanges. >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have >>> you had a chance to look at this yet? -- [[Jon]] + + >>>> Ping :) Hi. [[Joey]], would you consider this patch for the next + >>>> ikiwiki release? -- [[Jon]] ++ +>>> For this to work with websetup and --dumpsetup, it needs to define the +>>> `meta_*` settings in the getsetup function. +>>> +>>> I also have some concerns about both these patches, since both throw +>>> a lot of redundant data at meta, which then stores it in a very redundant +>>> way. Specifically, meta populates a per-page `%metaheaders` hash +>>> as well as storing per-page metadata in `%pagestate`. So, if you have +>>> a wiki with a thousand pages, and you add a 1k site-wide license text, +>>> that will bloat the memory usage of ikiwiki by in excess of 2 +>>> megabytes. It will also cause ikiwiki to write a similar amount more data +>>> to its state file which has to be loaded back in each +>>> run. +>>> +>>> Seems that this could be managed much more efficiently by having +>>> meta special-case the site-wide settings, not store them in these +>>> per-page data structures, and just make them be used if no per-page +>>> metadata of the given type is present. --[[Joey]]