diff options
| author | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2009-07-25 20:46:03 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2009-07-25 20:46:03 +0100 |
| commit | c2215feeddadcf10a48d5ac9ae4cebb4bba4d898 (patch) | |
| tree | 31507facf843fd07d226582a8c45fb1cc6bc53d3 | |
| parent | d2633aad3eb3d691b70b92d3093674c2865d62b2 (diff) | |
| download | ikiwiki-c2215feeddadcf10a48d5ac9ae4cebb4bba4d898.tar ikiwiki-c2215feeddadcf10a48d5ac9ae4cebb4bba4d898.tar.gz | |
New branch based on optimize-pagespecs: remove pagespec_merge
| -rw-r--r-- | doc/todo/should_optimise_pagespecs.mdwn | 7 | ||||
| -rw-r--r-- | doc/todo/tracking_bugs_with_dependencies.mdwn | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index ebe0b5055..db7a017c4 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -98,4 +98,11 @@ I can think about reducung the size of my wiki source and making it available on >>>> I haven't actually deleted it), because the "or" operation is now done in >>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]] +[[!template id=gitbranch branch=smcv/remove-pagespec-merge author="[[smcv]]"]] + +>>>>> I've now added a patch to the end of that branch that deletes +>>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in +>>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support +>>>>> future features like [[tracking_bugs_with_dependencies]]). --[[smcv]] + [[!tag wishlist patch patch/core]] diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn index 80aaf3c39..a198530fc 100644 --- a/doc/todo/tracking_bugs_with_dependencies.mdwn +++ b/doc/todo/tracking_bugs_with_dependencies.mdwn @@ -410,6 +410,9 @@ account all comments above (which doesn't mean it is above reproach :) ). --[[W >>>>> then the last definition (baz) takes precedence. >>>>> In the process of writing this I think I've come up with a way to change this back the way it was, still using closures. -- [[Will]] +>>> Alternatively, my [[remove-pagespec-merge|should_optimise_pagespecs]] +>>> branch solves this, in a Gordian knot sort of way :-) --[[smcv]] + >> Secondly, it seems that there are two types of dependency, and ikiwiki >> currently only handles one of them. The first type is "Rebuild this >> page when any of these other pages changes" - ikiwiki handles this. |