18 files changed, 126 insertions, 5 deletions

diff --git a/doc/todo/Add_space_before_slash_in_parent_links.mdwn b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
index 79044ccc6..536980ea8 100644
--- a/doc/todo/Add_space_before_slash_in_parent_links.mdwn
+++ b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
@@ -72,3 +72,12 @@ It's almost implicit in some of the discussion above but this can be achieved lo
         </TMPL_LOOP><TMPL_VAR TITLE></h1>
 
 This is what I do on my site for example. -- [[Jon]]
+
+> You don't actually need to fork the whole directory, "only" `page.tmpl` -
+> put `templatedir => "/foo/templates"` in your setup file, copy `page.tmpl`
+> to that directory, and modify it there. IkiWiki will look in `templatedir`
+> first, then fall back to its default templates if any are missing from
+> `templatedir`.
+>
+> (Admittedly, `page.tmpl` is the hardest to maintain a fork of, because it
+> tends to change whenever a new plugin is added...) --[[smcv]]
diff --git a/doc/todo/Raw_view_link.mdwn b/doc/todo/Raw_view_link.mdwn
index e4f941743..fd64074c2 100644
--- a/doc/todo/Raw_view_link.mdwn
+++ b/doc/todo/Raw_view_link.mdwn
@@ -10,4 +10,8 @@ The configuration setting for Mercurial could be something like this:
 > Not that I'm opposed to the idea of a plugin that adds a Raw link
 > --[[Joey]]
 
+>> In [[todo/source_link]], Will does this via the CGI instead of delegating
+>> to gitweb/etc. I think Will's patch is a good approach, and have improved
+>> on it a bit in a git branch.
+
 [[!tag wishlist]]
diff --git a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
index c651b0a45..0fb14bafe 100644
--- a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
+++ b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn
@@ -21,4 +21,6 @@ that we're at the root of a (sub-)hierarchy.
 > 
 > IMHO, what you really want is [[Moving_pages]]. :-) --[[Joey]]
 
+>> This sounds like WONTFIX to me? --[[smcv]]
+
 [[!tag wishlist]]
diff --git a/doc/todo/allow_creation_of_non-existent_pages.mdwn b/doc/todo/allow_creation_of_non-existent_pages.mdwn
index 9055c8a13..61f311b8c 100644
--- a/doc/todo/allow_creation_of_non-existent_pages.mdwn
+++ b/doc/todo/allow_creation_of_non-existent_pages.mdwn
@@ -8,4 +8,6 @@ From the [apache documentation](http://httpd.apache.org/docs/2.2/custom-error.ht
 
 > Nice idea, I'll try to find time to add a plugin doing this. --[[Joey]]
 
+>> [[done]] some time ago, as the [[plugins/404]] plugin --[[smcv]]
+
 [[wishlist]]
diff --git a/doc/todo/attachments.mdwn b/doc/todo/attachments.mdwn
index 56b2249ea..600c6cf7b 100644
--- a/doc/todo/attachments.mdwn
+++ b/doc/todo/attachments.mdwn
@@ -11,4 +11,12 @@ nice to add:
   srcdir. This would allow the admin to review them, and manually
   add/delete them before they bloat history.
 
+> I'd be inclined to implement that one by writing them to a nominated
+> underlay, I think, rather than having them in the srcdir but not in
+> the VCS. My [[plugins/contrib/album]] plugin could benefit from this
+> functionality, although in that case the photos should probably just
+> stay in the underlay forever (I already use an underlay on my own
+> websites for photos and software releases, which are too big to want
+> them in the VCS permanently.) --[[smcv]]
+
 [[!tag wishlist]]
diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 7306b1546..11b5fbcae 100644
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -1,5 +1,5 @@
 [[!tag patch patch/core]]
-[[!template id=gitbranch branch=smcv/among author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
 
 IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
 lossy transformation (to get it in the form that page templates want), making
@@ -9,3 +9,5 @@ A commit on my `among` branch splits it into IkiWiki::backlink_pages
 (which returns the keys of $backlinks{$page}, and might be suitable for
 exporting) and IkiWiki::backlinks (which calls backlink_pages, then performs
 the same lossy transformation as before on the result).
+
+[[done]] --[[Joey]]
diff --git a/doc/todo/dynamic_rootpage.mdwn b/doc/todo/dynamic_rootpage.mdwn
index 5cf80b0a8..3c39484bc 100644
--- a/doc/todo/dynamic_rootpage.mdwn
+++ b/doc/todo/dynamic_rootpage.mdwn
@@ -30,3 +30,6 @@ What's your opinion, Joey? I hope it's also useful for another ikiwiki lovers :)
 > like to have traditional `inline` functionality too.  This would work great if there were a way to change the `do`
 > parameter in the `blogpost` template's form; if I could change it to `datedblog` instead of `blog` then I could hook
 > my datedblog module in nicely, without having to override anything.  What would be the right way to do that? --[[neale]]
+
+> This is basically the same request as
+> [[todo/inline_postform_autotitles]]. --[[smcv]]
diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
new file mode 100644
index 000000000..1d24fd385
--- /dev/null
+++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
@@ -0,0 +1,7 @@
+[[!template id=gitbranch branch=smcv/gitignore author="[[smcv]]"]]
+[[!tag patch]]
+
+The recent merge of the po branch didn't come with a .gitignore.
+It eventually annoyed me enough to fix it :-) --[[smcv]]
+
+[[done]]
diff --git a/doc/todo/geotagging.mdwn b/doc/todo/geotagging.mdwn
index cb07e5e0c..65658d7c4 100644
--- a/doc/todo/geotagging.mdwn
+++ b/doc/todo/geotagging.mdwn
@@ -3,3 +3,5 @@ and search/sort pages by distance to a given location, as well as
 showing page locations on a map (Google Map, OpenStreetMap, etc). -- [[users/vibrog]]
 
 [[!tag wishlist]]
+
+> [[!cpan Geo::Coordinates::UTM]] would probably be useful. --[[smcv]]
diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index 336ae38d6..457b47884 100644
--- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
+++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
@@ -1,3 +1,5 @@
+[[!template id=gitbranch branch=smcv/ready/inline-pagenames author="[[smcv]]"]]
+
 A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
 the following parameter to the [[ikiwiki/directive/inline]] directive:
 
diff --git a/doc/todo/inline_postform_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn
index bdafd0b90..39713eb5f 100644
--- a/doc/todo/inline_postform_autotitles.mdwn
+++ b/doc/todo/inline_postform_autotitles.mdwn
@@ -17,6 +17,21 @@ resulting in ascending numeric page titles to be created.
 
 the second patch is actually a one-liner, filtering the title through strftime.
 
+> Something similar was requested in [[todo/more_customisable_titlepage_function]],
+> in which [[Joey]] outlined a similar solution.
+>
+> What's your use-case for not prompting for the title at all? I can see
+> [[madduck]]'s requirement for the title he typed in (say, "foo")
+> being transformed into 2009/07/26/foo or something (I name blog posts
+> like that myself), but I can't quite see the use for *entirely* automatic
+> titles.
+>
+> However, if that's really what you want, I suspect your code could be
+> extended so it also solves madduck's second request on
+> [[todo/more_customisable_titlepage_function]].
+>
+> --[[smcv]]
+
 ### potential user interaction issues
 
 this has two side effects which have to be considered: first, the empty page
diff --git a/doc/todo/more_customisable_titlepage_function.mdwn b/doc/todo/more_customisable_titlepage_function.mdwn
index 51b560746..97fefbafc 100644
--- a/doc/todo/more_customisable_titlepage_function.mdwn
+++ b/doc/todo/more_customisable_titlepage_function.mdwn
@@ -2,7 +2,9 @@ I understand the `IkiWiki::titlepage` function is used to generate filenames fro
 
 I imagine two things: a lookup hash and a template.
 
-Since `IkiWiki::titlepage` basically translates characters, it would be cool to be able to define a lookup hash in the configuration, which would be consulted before falling back to the generic `__xx__` `ord()` representation of a letter. For instance, in German, I might prefer to have 'ä' become 'ae' instead of something illegible.
+Since `IkiWiki::titlepage` basically translates characters, it would be cool to be able to define a lookup hash in the configuration, which would be consulted before falling back to the generic `__xx__` `ord()` representation of a letter. For instance, in German, I might prefer to have 'ä' become 'ae' instead of something illegible.
+
+> This is [[todo/unaccent_url_instead_of_encoding]]. --[[smcv]]
 
 Second, maybe a template could be honoured. The template could have a slot `%s` where the calculated title goes, and it could contain `strftime` symbols as well as variables, which get interpolated on use.
 
@@ -10,6 +12,11 @@ Another option would be a function I could define in the setup file, or an exter
 
 -- [[madduck]]
 
+> This somewhat resembles [[todo/inline_postform_autotitles]].
+> Another way to do this, suggested in that todo, would be to
+> pre-fill the title field with YYYY/MM/DD/ using Javascript.
+> --[[smcv]]
+
 I don't think that changing titlepage is a good idea, there are
 compatability problems.
 
@@ -28,4 +35,8 @@ is that having the directive appear in the edit box for a new page could
 confuse the user. The title could be passed on in a hidden field, and
 prepended to the page when it's saved..
 
+--[[Joey]]
+
+> I'll pass on these comments to the two similar todo items. --[[smcv]]
+
 [[wishlist]]
diff --git a/doc/todo/more_flexible_inline_postform.mdwn b/doc/todo/more_flexible_inline_postform.mdwn
index 112220394..bc8bc0809 100644
--- a/doc/todo/more_flexible_inline_postform.mdwn
+++ b/doc/todo/more_flexible_inline_postform.mdwn
@@ -12,3 +12,7 @@ the post form and stuck it inside a [[plugins/toggle]].
 logical first step towards doing comment-like things with inlined pages).
 
 -- [[Jon]]
+
+> Perhaps what we need is a `postform` plugin/directive that inline depends
+> on (automatically enables); its preprocess method could automatically be
+> invoked from preprocess_inline when needed. --[[smcv]]
diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index 099d26665..fd15d6a42 100644
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -1,5 +1,5 @@
 [[!tag patch plugins/pagestats]]
-[[!template id=gitbranch branch=smcv/among author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
 
 My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
 to provide pagestats for links from a subset of pages. From the docs included
@@ -25,3 +25,5 @@ I use this on my tag pages on one site, with the following template:
       archive="yes" quick="yes" reverse="yes" timeformat="%x"]]
 
 --[[smcv]]
+
+> [[merged|done]] thanks --[[Joey]] 
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index ebe0b5055..3ccef62fe 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -79,7 +79,7 @@ I can think about reducung the size of my wiki source and making it available on
 > 
 > --[[Joey]]
 
-[[!template id=gitbranch branch=smcv/optimize-depends author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/optimize-depends author="[[smcv]]"]]
 
 >> I've been looking at optimizing ikiwiki for a site using
 >> [[plugins/contrib/album]] (which produces a lot of pages) and it seems
@@ -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/ready/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/source_link.mdwn b/doc/todo/source_link.mdwn
index 9d9ec9697..ce8c9d171 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -9,6 +9,29 @@ I just implemented this.  There is one [[patch]] to the default page template, a
 > by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
 > --[[smcv]]
 
+[[!template id=gitbranch branch=smcv/ready/getsource
+  author="[[Will]]/[[smcv]]"]]
+
+>> I've applied the patch below in a git branch, fixed my earlier criticism,
+>> and also fixed a couple of other issues I noticed:
+>>
+>> * missing pages could be presented better as a real 404 page
+>> * the default Content-type should probably be UTF-8 since the rest of
+>>   IkiWiki tends to assume that
+>> * emitting attachments (images, etc.) as text/plain isn't going to work :-)
+>>
+>> Any opinions on my branch? I think it's ready for merge, if Joey approves.
+>>
+>> --[[smcv]]
+
+>>> I need a copyright&license statement, so debian/copyright can be updated for
+>>> the plugin, before I can merge this. Otherwise ready. --[[Joey]]
+
+>>> That looks like a nice set of fixes.  One more that might be worthwhile: instead of reading the page source into a var, and then writing it out later, it might be nice to just
+>>>  `print readfile(srcfile(pagesources{$page}));` at the appropriate point. -- [[Will]]
+
+>>>> OK, I've committed that. --[[smcv]]
+
 ----
 
     diff --git a/templates/page.tmpl b/templates/page.tmpl
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.
diff --git a/doc/todo/unaccent_url_instead_of_encoding.mdwn b/doc/todo/unaccent_url_instead_of_encoding.mdwn
index d74b632bd..e5ad34335 100644
--- a/doc/todo/unaccent_url_instead_of_encoding.mdwn
+++ b/doc/todo/unaccent_url_instead_of_encoding.mdwn
@@ -4,6 +4,21 @@ This works right from a technical point of view, but the URLs will become ugly.
 So I made a patch which unaccent chars: <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/unaccentpagetitlenames/>
 This is a one liner change, but requires a bit of reordering in the code.
 
-[[cstamas]]
+--[[cstamas]]
+
+> This was previously requested in [[todo/more_customisable_titlepage_function]],
+> in which [[Joey]] said "I don't think that changing titlepage is a good idea,
+> there are compatability problems".
+>
+> The problem is that altering titlepage changes the meaning of your wiki,
+> by resolving all wiki links to different page names. That means that:
+>
+> * unaccenting can't be automatic, it has to be a configuration option
+>   (so you don't accidentally get different behaviour by installing
+>   Text::Unaccent)
+> * upgrading Text::Unaccent becomes risky, as I doubt it guarantees to
+>   have stable rules for how to transliterate into ASCII!
+>
+> --[[smcv]]
 
 [[!tag wishlist patch patch/core]]