From 9d0b13bb2b88d625ffafa8d253e03800728dcad2 Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Tue, 9 Jun 2009 18:37:58 -0400 Subject: More NTFS filename compatability problems. --- doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn index 0fccd1dcb..7559e6d0a 100644 --- a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn +++ b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn @@ -68,3 +68,8 @@ Windows does not support filenames containing any of these characters: `/ \ * : >>> ikiwiki on windows, including its assumption that the directory >>> separator is "/". Windows will be supported when someone sends me a >>> comprehansive and not ugly or performance impacting patch. :-) --[[Joey]] + +> Speaking of Windows filename problems, how do I keep directories ending in a +> period from being created? The following didn't seem to work. +> `wiki_file_chars => "-[:alnum:]+/._",` +> `wiki_file_regex => '[-[:alnum:]+_]$',` -- cgit v1.2.3 From 86a83a2a69df86879c80759e0df6c517b49e1c57 Mon Sep 17 00:00:00 2001 From: "http://www.larted.org.uk/~dom/" Date: Sat, 13 Jun 2009 07:56:56 -0400 Subject: comment about newer OpenID now being available. --- doc/bugs/support_for_openid2_logins.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index 1d99370f6..f82ceb036 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -15,3 +15,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco > an OpenID 2 implementation (it's the second of the projects > above). I've filed a bug in Debian asking for the package to be > updated. --[[smcv]] + +> Net::OpenID::Consumer 1.x is not in Debian unstable --[[dom]] -- cgit v1.2.3 From f67cf324716770572b6671845dc3d4e8058a815e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 14:33:52 -0400 Subject: response --- doc/bugs/support_for_openid2_logins.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc/bugs') diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index f82ceb036..833f8ee4e 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -16,4 +16,7 @@ However both Perl OpenID 2.x implementations have not been released and are inco > above). I've filed a bug in Debian asking for the package to be > updated. --[[smcv]] -> Net::OpenID::Consumer 1.x is not in Debian unstable --[[dom]] +> Net::OpenID::Consumer 1.x is now in Debian unstable --[[dom]] + +> Would someone with an v2 only openid provider test it and close this bug +> if it works? --[[Joey]] -- cgit v1.2.3 From e0c7fed8e682e4f11a1e90eb98c81ed7087809fe Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 21:08:32 -0400 Subject: tested yahoo working --- doc/bugs/support_for_openid2_logins.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn index 833f8ee4e..139a53760 100644 --- a/doc/bugs/support_for_openid2_logins.mdwn +++ b/doc/bugs/support_for_openid2_logins.mdwn @@ -18,5 +18,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco > Net::OpenID::Consumer 1.x is now in Debian unstable --[[dom]] -> Would someone with an v2 only openid provider test it and close this bug -> if it works? --[[Joey]] +> I've tested with yahoo, and it works with the updated module. Sweet and +> [[done]] --[[Joey]] -- cgit v1.2.3 From d17bce8bb2b2cf375e1acd13d9f5ea706f13215f Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:22:02 +0100 Subject: new bug: map doesn't close UL for empty list --- .../map_fails_to_close_ul_element_for_empty_list.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn new file mode 100644 index 000000000..c786c5f68 --- /dev/null +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -0,0 +1,16 @@ +input: + + before. + \[[!map pages="sdfsdfsdfsd/*"]] + after. + +Presuming that the pagespec does not match, output: + + <p>before. + <div class="map"> + <ul> + </div></p> + +The UL element is not closed. + +-- [[Jon]] -- cgit v1.2.3 From 82cc6ff4dadefa57c920c77ceb6a481afe6f0be9 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:28:36 +0100 Subject: patch for this bug --- .../map_fails_to_close_ul_element_for_empty_list.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index c786c5f68..28960b9d7 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -13,4 +13,23 @@ Presuming that the pagespec does not match, output: The UL element is not closed. +Patch[[!tag patch]]: + + --- /usr/share/perl5/IkiWiki/Plugin/map.pm 2009-05-06 00:56:55.000000000 +0100 + +++ IkiWiki/Plugin/map.pm 2009-06-15 12:23:54.000000000 +0100 + @@ -137,11 +137,11 @@ + $openli=1; + $parent=$item; + } + - while ($indent > 0) { + + while ($indent > 1) { + $indent--; + $map .= "\n\n"; + } + - $map .= "\n"; + + $map .= "\n\n"; + return $map; + } + + -- [[Jon]] -- cgit v1.2.3 From 04964d3ac0ccb6e9cebcb33708463a0ccb84cee7 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Mon, 15 Jun 2009 12:29:23 +0100 Subject: don't escape <> (done for us) --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index 28960b9d7..b1f8ed2b3 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -6,10 +6,10 @@ input: Presuming that the pagespec does not match, output: - <p>before. - <div class="map"> - <ul> - </div></p> +

before. +

+
    +

The UL element is not closed. -- cgit v1.2.3 From 6c91edea7cd62f46a7f598e453c6f265b15c1e71 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 12:22:24 -0400 Subject: bug report + patch --- doc/bugs/img_with_alt_has_extra_double_quote.mdwn | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 doc/bugs/img_with_alt_has_extra_double_quote.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn new file mode 100644 index 000000000..18aea6841 --- /dev/null +++ b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn @@ -0,0 +1,30 @@ +The [[ikiwiki/directive/img]] directive emits an extra double quote if alt=x is +specified (as is necessary for valid HTML). This results in malformed HTML, +like this: + + A + ^ + +This [[patch]] is available from the img-bugfix branch in my git repository: + + commit a648c439f3467571374daf597e9b3a659ea2008f + Author: Simon McVittie + Date: 2009-06-16 17:15:06 +0100 + + img plugin: do not emit a redundant double-quote before alt attribute + + diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm + index a697fea..a186abd 100644 + --- a/IkiWiki/Plugin/img.pm + +++ b/IkiWiki/Plugin/img.pm + @@ -121,7 +121,7 @@ sub preprocess (@) { + my $imgtag=''.$params{alt}.' Date: Tue, 16 Jun 2009 15:09:49 -0400 Subject: img: Fix extra double quote with alt text. (smcv) --- debian/changelog | 6 ++++++ doc/bugs/img_with_alt_has_extra_double_quote.mdwn | 2 ++ 2 files changed, 8 insertions(+) (limited to 'doc/bugs') diff --git a/debian/changelog b/debian/changelog index 8ee065803..86aeb0b7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1415) UNRELEASED; urgency=low + + * img: Fix extra double quote with alt text. (smcv) + + -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" diff --git a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn index 18aea6841..81bbe7fb5 100644 --- a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn +++ b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn @@ -28,3 +28,5 @@ This [[patch]] is available from the img-bugfix branch in my git repository: (exists $params{id} ? ' id="'.$params{id}.'"' : ''). --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From 0d76893483f961755dc181d4a2fd2ee3af1373ea Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 22 Jun 2009 06:57:00 -0400 Subject: bug report + patches --- .../openid_no_longer_pretty-prints_OpenIDs.mdwn | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn new file mode 100644 index 000000000..a2bb5893a --- /dev/null +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -0,0 +1,23 @@ +The git commit (in my `openid` branch) says it all: + + Update IkiWiki::openiduser to work with Net::OpenID 2.x + + openiduser previously used a constructor that no longer works in 2.x. + However, all we actually want is the (undocumented) DisplayOfURL function + that is invoked by the display method, so try to use that. + +This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). + +Relatedly, the other commit on the same branch would be nice to have: + + Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser + + On various sites I have two IkiWiki instances running from the same + repository: one accessible via http and only accepting openid logins, + and one accessible via authenticated https and only accepting httpauth. + Ideally, the https version should still pretty-print OpenIDs seen in + git history. + +--[[smcv]] + +[[!tag patch]] -- cgit v1.2.3 From 3bb2260fc46c38a7933e379f1a0b5e66df154aec Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Wed, 1 Jul 2009 08:50:42 -0400 Subject: prettydate creates Last edited in the wee hours of Tuesday night, July 1st, 2009 --- doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn new file mode 100644 index 000000000..40aab55ac --- /dev/null +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -0,0 +1 @@ +Prettydate creates strings like this: _Last edited in the wee hours of Tuesday night, July 1st, 2009_. However, July 1st is a Wednesday, so either date or Weekday should be modified. In the spirit is probably _Tuesday night, June 30th_. --ulrik -- cgit v1.2.3 From c4978bfb31bbc2c248db9fc45d69487206dfd852 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Jul 2009 13:47:30 -0400 Subject: response --- ...prettydate_with_weekday-date_inconsistency.mdwn | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 40aab55ac..807ba479d 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -1 +1,28 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday night, July 1st, 2009_. However, July 1st is a Wednesday, so either date or Weekday should be modified. In the spirit is probably _Tuesday night, June 30th_. --ulrik + +> The default prettydate times are fairly idiosyncratic to +> how [[Joey]] thinks about time. Specifically, it's still +> Tuesday night until he wakes up Wednesday morning -- which +> could be in the afternoon. :-P But, Joey also realizes +> that dates change despite his weird time sense, and so +> July 1st starts at midnight on Tuesday and continues +> through Tuesday night and part of Wednesday. +> +> (This might not be as idiosyncratic as I make it out to be.. +> I think that many people would agree that in the wee hours +> of New Years Eve, when they're staggering home ahead of +> the burning daylight, the date is already January 1st.) +> +> I think the bug here is that prettydate can't represent +> all views of time. While the times +> of day can be configured, and it's possible to configure it +> to call times after midnight "Wednesday morning, July 1st", +> it is not possible to configure the date or weekday based +> on the time of day. +> +> In order to do so, prettydate's timetable would need to be +> extended to include the "%B %o, %Y" part, and that extended +> to include "%B-", "%o-", and "%Y-" to refer to the day +> before. +> +> --[[Joey]] -- cgit v1.2.3 From 0c15865aeebcdf7f42c02f51d5bad0a1dd554b90 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Thu, 2 Jul 2009 14:19:35 -0400 Subject: >> fair enough, I think I can get converted to a warped time perspective. --ulrik --- doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 807ba479d..111ade8dd 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -26,3 +26,5 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday n > before. > > --[[Joey]] + +>> fair enough, I think I can get converted to a warped time perspective. --ulrik -- cgit v1.2.3 From df6430afae4632c000cee2b6bfbcd5c8c759dd83 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 13:40:17 -0400 Subject: response --- doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn index a2bb5893a..1e2030b23 100644 --- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -8,6 +8,8 @@ The git commit (in my `openid` branch) says it all: This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). +> Cherry picked, thanks. --[[Joey]] + Relatedly, the other commit on the same branch would be nice to have: Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser @@ -20,4 +22,8 @@ Relatedly, the other commit on the same branch would be nice to have: --[[smcv]] +> I wonder if an option is the best approach. Maybe it would be better to +> simply move `openiduser` into `userlink`, and thus always support openid +> usernames whether the plugin is enabled or not. --[[Joey]] + [[!tag patch]] -- cgit v1.2.3 From fe7b5b2405f049201f0f99eea907bbf5381f3bb8 Mon Sep 17 00:00:00 2001 From: Djoume Date: Tue, 7 Jul 2009 13:49:50 -0400 Subject: added neted raw included inlines bug. --- doc/bugs/nested_raw_included_inlines.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/nested_raw_included_inlines.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn new file mode 100644 index 000000000..6cb4a973d --- /dev/null +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -0,0 +1,26 @@ +I have the following structure: + +## page0 + # Page 0 + [[!inline raw="yes" pages="page1"]] + +## page1 + # Page 1 + [[!inline pages="page2"]] + +## page2 + # Page 2 + test + +In this situation, a change in page 2 will trigger a rebuild of page1 but not of page0. + + refreshing wiki.. + scanning page2.mdwn + rendering page2.mdwn + rendering page1.mdwn, which depends on page2 + done + +In my real world situation, page1 is actually listing all pages that match a certain tag and page0 is the home page. +Whenever a page got tagged, it will appear on page1 but not on page0. + +Am I missing something? Is this a bug or Ikiwiki not supposed to support this use case? -- cgit v1.2.3 From f7f4353f14794f958505f3209d546ad1a7cf87dc Mon Sep 17 00:00:00 2001 From: Djoume Date: Tue, 7 Jul 2009 14:44:17 -0400 Subject: fixed formatting --- doc/bugs/nested_raw_included_inlines.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn index 6cb4a973d..792bc843c 100644 --- a/doc/bugs/nested_raw_included_inlines.mdwn +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -2,11 +2,11 @@ I have the following structure: ## page0 # Page 0 - [[!inline raw="yes" pages="page1"]] + \[[!inline raw="yes" pages="page1"]] ## page1 # Page 1 - [[!inline pages="page2"]] + \[[!inline pages="page2"]] ## page2 # Page 2 -- cgit v1.2.3 From 98ae5a15da8223f4a2952d9aad94c7dc1708e6cc Mon Sep 17 00:00:00 2001 From: Djoume Date: Wed, 8 Jul 2009 12:46:47 -0400 Subject: added web file rename when using svn bug --- ...a_the_web_is_failing_when_using_subversion.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn new file mode 100644 index 000000000..4f2257891 --- /dev/null +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -0,0 +1,24 @@ +I'm using ikiwiki 3.12 on Mac OS X (installed via mac ports) + +When trying to rename a file via the web interface (using the rename plugin) I get the following error: + +Error: Undefined subroutine &IkiWiki::Plugin::svn::dirname called at /opt/local/lib/perl5/vendor_perl/5.8.9/IkiWiki/Plugin/svn.pm line 246. + +Applying the following patch fixed it: + + --- IkiWiki/Plugin/svn.pm.orig 2009-07-08 12:25:23.000000000 -0400 + +++ IkiWiki/Plugin/svn.pm 2009-07-08 12:28:36.000000000 -0400 + @@ -243,10 +243,10 @@ + + if (-d "$config{srcdir}/.svn") { + # Add parent directory for $dest + - my $parent=dirname($dest); + + my $parent=IkiWiki::dirname($dest); + if (! -d "$config{srcdir}/$parent/.svn") { + while (! -d "$config{srcdir}/$parent/.svn") { + - $parent=dirname($dest); + + $parent=Ikiwiki::dirname($dest); + } + if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { + warn("svn add $parent failed\n"); + -- cgit v1.2.3 From 0c6a47e9e4c6a5508868b730bed0ac2d0c358ae4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2009 13:13:23 -0400 Subject: svn: Fix rcs_rename to properly scope call to dirname. --- IkiWiki/Plugin/svn.pm | 4 ++-- debian/changelog | 6 ++++++ ...enaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index fe55e7d08..06b987f51 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -243,10 +243,10 @@ sub rcs_rename ($$) { if (-d "$config{srcdir}/.svn") { # Add parent directory for $dest - my $parent=dirname($dest); + my $parent=IkiWiki::dirname($dest); if (! -d "$config{srcdir}/$parent/.svn") { while (! -d "$config{srcdir}/$parent/.svn") { - $parent=dirname($dest); + $parent=IkiWiki::dirname($dest); } if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); diff --git a/debian/changelog b/debian/changelog index 239b22b42..e83e570d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1416) UNRELEASED; urgency=low + + * svn: Fix rcs_rename to properly scope call to dirname. + + -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn index 4f2257891..1a737df0a 100644 --- a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -22,3 +22,7 @@ Applying the following patch fixed it: if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); + +> Thank you very much for the patch, which I've applied. I wonder how +> that snuck in (aside from the obvious, that the svn plugin is not often +> used and the code was added w/o being tested..). [[done]] --[[Joey]] -- cgit v1.2.3 From 1c614914cc7b5fe187298dad88bafa0bdf8f106c Mon Sep 17 00:00:00 2001 From: "smcv@" Date: Fri, 10 Jul 2009 18:56:47 +0100 Subject: Close bug (joeyh merged my patch), split out feature request, provide alternative patch --- .../openid_no_longer_pretty-prints_OpenIDs.mdwn | 22 +++++--------------- .../pretty-print_OpenIDs_even_if_not_enabled.mdwn | 24 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn index 1e2030b23..85a206bc0 100644 --- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn +++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn @@ -8,22 +8,10 @@ The git commit (in my `openid` branch) says it all: This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]). -> Cherry picked, thanks. --[[Joey]] +> Cherry picked, thanks. --[[Joey]] -Relatedly, the other commit on the same branch would be nice to have: +Relatedly, the other commit on the same branch would be nice to have +(edited to add: I've now moved it, and its discussion, to +[[todo/pretty-print_OpenIDs_even_if_not_enabled]]). --[[smcv]] - Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser - - On various sites I have two IkiWiki instances running from the same - repository: one accessible via http and only accepting openid logins, - and one accessible via authenticated https and only accepting httpauth. - Ideally, the https version should still pretty-print OpenIDs seen in - git history. - ---[[smcv]] - -> I wonder if an option is the best approach. Maybe it would be better to -> simply move `openiduser` into `userlink`, and thus always support openid -> usernames whether the plugin is enabled or not. --[[Joey]] - -[[!tag patch]] +[[!tag done]] diff --git a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn new file mode 100644 index 000000000..373c120a6 --- /dev/null +++ b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn @@ -0,0 +1,24 @@ +A feature I originally requested on +[[a_related_bug|bugs/openid_no_longer_pretty-prints_OpenIDs]]: + + Allow the openid plugin to be loaded but disabled, for its side-effect of defining IkiWiki::openiduser + + On various sites I have two IkiWiki instances running from the same + repository: one accessible via http and only accepting openid logins, + and one accessible via authenticated https and only accepting httpauth. + Ideally, the https version should still pretty-print OpenIDs seen in + git history. + +--[[smcv]] + +> I wonder if an option is the best approach. Maybe it would be better to +> simply move `openiduser` into `userlink`, and thus always support openid +> usernames whether the plugin is enabled or not. --[[Joey]] + +>> OK, implemented that as 'smcv/always-openid'; if you don't think that's +>> bloating the IkiWiki core too much, please consider merging. The poll on +>> [[news/openid]] indicates fairly strong support for *only* accepting OpenID +>> logins, so I think recognising OpenIDs can reasonably be considered core +>> functionality! --[[smcv]] + +[[!tag patch]] -- cgit v1.2.3 From f58b5c798a7a5ad4ae2a85833766e761a407f02d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Jul 2009 19:08:38 +0100 Subject: dependency inheritance considered scary, although my branch might help --- doc/bugs/nested_raw_included_inlines.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn index 792bc843c..33433e235 100644 --- a/doc/bugs/nested_raw_included_inlines.mdwn +++ b/doc/bugs/nested_raw_included_inlines.mdwn @@ -24,3 +24,11 @@ In my real world situation, page1 is actually listing all pages that match a cer Whenever a page got tagged, it will appear on page1 but not on page0. Am I missing something? Is this a bug or Ikiwiki not supposed to support this use case? + +> Perhaps the inline plugin isn't being clever enough about dependencies - +> strictly speaking, when a page is inlined with full content, the inlining +> page should probably inherit all the inlined page's dependencies. +> That might be prohibitively slow in practise due to the way IkiWiki +> currently merges pagespecs, though - maybe the patches I suggested for +> [[separating_and_uniquifying_pagespecs|todo/should_optimise_pagespecs]] +> would help? --[[smcv]] -- cgit v1.2.3 From a13038458fc5712ec651f8afb6a58fe3c4fb21f8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Jul 2009 19:21:02 +0100 Subject: attempt to clear up the bugs list a bit --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 5 +++++ doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn | 2 ++ 2 files changed, 7 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index b1f8ed2b3..4ce257252 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -33,3 +33,8 @@ Patch[[!tag patch]]: -- [[Jon]] + +> Strictly speaking, a `
    ` with no `
  • `s isn't valid HTML either... +> could `map` instead delay emitting the first `
      ` until it determines that +> it will have at least one item? Perhaps refactoring that function into +> something easier to regression-test would be useful. --[[smcv]] diff --git a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn index 111ade8dd..430d65a3f 100644 --- a/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn +++ b/doc/bugs/prettydate_with_weekday-date_inconsistency.mdwn @@ -28,3 +28,5 @@ Prettydate creates strings like this: _Last edited in the wee hours of Tuesday n > --[[Joey]] >> fair enough, I think I can get converted to a warped time perspective. --ulrik + +>>> Perhaps we can consider this [[done]], then? --[[smcv]] -- cgit v1.2.3 From 78ab937dbf7d33b77076907539ed463ba4df1337 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 16:31:09 -0400 Subject: Details of oddness under boa --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index a40a454c1..005e5ccce 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -67,3 +67,10 @@ Why do they appear two times with conflicting values in the very same hashes? >>>> (reported as [[!debbug 437927]] and [[!debbug 437932]]) --[[JeremieKoenig]] Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] + +I'm getting some odd behaviour with boa. When I edit a page and click "Save +Page", the URL I get taken to produces a 403 - Forbidden error until I reload +it. For example, it brings me back to page `http://localhost/~pdw/iki/?updated`, +I see a 403 error message, then I hit Ctrl-R, and then the page displays +correctly, with the same URL that gave an error a moment ago. This is with boa +0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. -- cgit v1.2.3 From 15e61fe2a7b6b500bf09d34d703e3b447fbd5e08 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 17:07:16 -0400 Subject: Add more detail to problem with ikiwiki under boa. --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 005e5ccce..2240f5dc3 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -69,8 +69,12 @@ Why do they appear two times with conflicting values in the very same hashes? Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] I'm getting some odd behaviour with boa. When I edit a page and click "Save -Page", the URL I get taken to produces a 403 - Forbidden error until I reload -it. For example, it brings me back to page `http://localhost/~pdw/iki/?updated`, -I see a 403 error message, then I hit Ctrl-R, and then the page displays -correctly, with the same URL that gave an error a moment ago. This is with boa -0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. +Page", the URL I get taken to produces a 403 - Forbidden error until I recompile +the wiki. For example, after editing the root page of the wiki it brings me back to +`http://localhost/~pdw/iki/?updated`, and I see a 403 error message. Then, if +I open up a terminal and type `ikiwiki --setup ikiwiki.setup`, and then go back +to the browser and hit Ctrl-R, the page displays correctly, with the same URL +that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox +3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; +any suggestions where to start looking? This is a very basic setup, so feel +free to ask. --Paul -- cgit v1.2.3 From fe45beae71c97938f2cb067e0ec22c1c7760eacf Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Jul 2009 17:57:19 -0400 Subject: response - you are correct, ULs require >= 1 LI children --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index 4ce257252..a3bd3cc01 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -38,3 +38,10 @@ Patch[[!tag patch]]: > could `map` instead delay emitting the first `
        ` until it determines that > it will have at least one item? Perhaps refactoring that function into > something easier to regression-test would be useful. --[[smcv]] + +>> You are right (just checked 4.01 DTD to confirm). I suspect refactoring +>> the function would be wise. From my brief look at it to formulate the +>> above I thought it was a bit icky. I'm not a good judge of what would +>> be regression-test friendly but I might have a go at reworking it. With +>> this variety of problem I have a strong inclination to use things like +>> map. - [[Jon]] -- cgit v1.2.3 From de754113b5fb4e4e6e5ead5c450d679aefdbb1d3 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Jul 2009 17:58:36 -0400 Subject: clarify which map I mena --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index a3bd3cc01..0edba438c 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -43,5 +43,5 @@ Patch[[!tag patch]]: >> the function would be wise. From my brief look at it to formulate the >> above I thought it was a bit icky. I'm not a good judge of what would >> be regression-test friendly but I might have a go at reworking it. With ->> this variety of problem I have a strong inclination to use things like ->> map. - [[Jon]] +>> this variety of problem I have a strong inclination to use HOFs like map, +>> grep. - [[Jon]] -- cgit v1.2.3 From 1eda850d12a37d68d8443c4009515f608cb174e2 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Sun, 12 Jul 2009 18:31:35 -0400 Subject: Found fix to problem under boa, added details and request for etiquette guidance. --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 2240f5dc3..7cfc53741 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -78,3 +78,16 @@ that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox 3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; any suggestions where to start looking? This is a very basic setup, so feel free to ask. --Paul + +Tried setting up a git repository back-end for the wiki, in case the `post-update` +hook caused the right updates to happen; it didn't. (But I do now have my wiki +in git!) + +Turns out that `.../destdir/index.html` was being recreated after a web edit, or +at least having its permissions modified, and being left without world-read +permissions. Boa was then rightly refusing to serve the page. Adding the +`umask 022` config option to `ikiwiki.setup` fixed everything, and all +appears to be working fine now. --Paul. + +(I'm new to wiki etiquette - would it be more polite to leave these details on the +wiki, or to remove them and only leave a short summary? Thanks. --Paul) -- cgit v1.2.3 From a41a12ab9a7206d324ad198e287a37fc17172f18 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Jul 2009 21:32:24 -0400 Subject: response --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 7cfc53741..3f80bbbd6 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -68,6 +68,8 @@ Why do they appear two times with conflicting values in the very same hashes? Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] +---- + I'm getting some odd behaviour with boa. When I edit a page and click "Save Page", the URL I get taken to produces a 403 - Forbidden error until I recompile the wiki. For example, after editing the root page of the wiki it brings me back to @@ -89,5 +91,15 @@ permissions. Boa was then rightly refusing to serve the page. Adding the `umask 022` config option to `ikiwiki.setup` fixed everything, and all appears to be working fine now. --Paul. +> Since others seem to have gotten ikiwiki working with boa, +> I'm guessing that this is not a generic problem with boa, but that +> your boa was started from a shell that had an unusual umask and inherited +> that. --[[Joey]] + (I'm new to wiki etiquette - would it be more polite to leave these details on the wiki, or to remove them and only leave a short summary? Thanks. --Paul) + +> Well, I just try to keep things understandable and clear, whether than +> means deleting bad old data or not. That said, this page is a bug report, +> that was already closed. It's generally better to open a new bug report +> rather than edit an old closed one. --[[Joey]] -- cgit v1.2.3 From 8c4800b55de32a84af1f0a1d8872eca315836852 Mon Sep 17 00:00:00 2001 From: "http://pdwhittaker.myopenid.com/" Date: Mon, 13 Jul 2009 16:28:31 -0400 Subject: Trim previous "bug" report --- doc/bugs/CGI_problem_with_some_webservers.mdwn | 47 ++++++++++++++------------ 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'doc/bugs') diff --git a/doc/bugs/CGI_problem_with_some_webservers.mdwn b/doc/bugs/CGI_problem_with_some_webservers.mdwn index 3f80bbbd6..e4b0fd448 100644 --- a/doc/bugs/CGI_problem_with_some_webservers.mdwn +++ b/doc/bugs/CGI_problem_with_some_webservers.mdwn @@ -70,36 +70,39 @@ Marking [[done]] since it's not really an ikiwiki bug. --[[Joey]] ---- -I'm getting some odd behaviour with boa. When I edit a page and click "Save -Page", the URL I get taken to produces a 403 - Forbidden error until I recompile -the wiki. For example, after editing the root page of the wiki it brings me back to -`http://localhost/~pdw/iki/?updated`, and I see a 403 error message. Then, if -I open up a terminal and type `ikiwiki --setup ikiwiki.setup`, and then go back -to the browser and hit Ctrl-R, the page displays correctly, with the same URL -that gave an error a moment ago. This is with boa 0.94.14rc21-3 and Firefox -3.0.11 on Ubuntu 9.04. I get the feeling I'm doing something wrong somewhere; -any suggestions where to start looking? This is a very basic setup, so feel -free to ask. --Paul - -Tried setting up a git repository back-end for the wiki, in case the `post-update` -hook caused the right updates to happen; it didn't. (But I do now have my wiki -in git!) - -Turns out that `.../destdir/index.html` was being recreated after a web edit, or -at least having its permissions modified, and being left without world-read -permissions. Boa was then rightly refusing to serve the page. Adding the -`umask 022` config option to `ikiwiki.setup` fixed everything, and all -appears to be working fine now. --Paul. +I'm using boa and getting some odd behaviour if I don't set the `umask` +option in the config file. Editing a page through the web interface and +hitting "Save Page" regenerates the `index.html` file with no world-read +permissions. As a result, the server serves a "403 - Forbidden" error page +instead of the page I was expecting to return to. + +There are only two ways I found to work around this: adding a `umask 022` +option to the config file, or re-compiling the wiki from the command line +using `ikiwiki --setup`. Setting up a git back-end and re-running `ikiwiki +--setup` from inside a hook had no effect; it needed to be at the terminal. +--Paul > Since others seem to have gotten ikiwiki working with boa, > I'm guessing that this is not a generic problem with boa, but that > your boa was started from a shell that had an unusual umask and inherited > that. --[[Joey]] -(I'm new to wiki etiquette - would it be more polite to leave these details on the -wiki, or to remove them and only leave a short summary? Thanks. --Paul) +>> That's right; once I'd worked out what was wrong, it was clear that any +>> webserver should have been refusing to serve the page. I agree about the +>> inherited umask; I hadn't expected that. Even if it's unusual, though, it +>> probably won't be uncommon - this was a stock Ubuntu 9.04 install. --Paul + +(I'm new to wiki etiquette - would it be more polite to leave these details +on the wiki, or to remove them and only leave a short summary? Thanks. +--Paul) > Well, I just try to keep things understandable and clear, whether than > means deleting bad old data or not. That said, this page is a bug report, > that was already closed. It's generally better to open a new bug report > rather than edit an old closed one. --[[Joey]] + +>> Thanks for the feedback, I've tidied up my comment accordingly. I see +>> your point about the bug; sorry for cluttering the page up. I doubt it's +>> worth opening a new page at this stage, but will do so if there's a next +>> time. The solution seems worth leaving, though, in case anyone else in my +>> situation picks it up. --Paul -- cgit v1.2.3 From d2b1264546fa412db8c1591bc8bb14aba04b960d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 18 Jul 2009 13:06:04 +0100 Subject: Tag patches with the plugin to which they apply, or core --- doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn | 4 +++- doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 6 ++++-- doc/bugs/search_for_locale_data_in_the_installed_location.mdwn | 2 +- doc/patch/core.mdwn | 7 +++++++ doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn | 2 +- doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn | 2 +- doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn | 2 +- doc/todo/allow_site-wide_meta_definitions.mdwn | 4 +++- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +- doc/todo/blogpost_plugin.mdwn | 2 +- doc/todo/enable-htaccess-files.mdwn | 4 +--- doc/todo/format_escape.mdwn | 2 +- .../hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn | 2 +- doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn | 6 ++++-- doc/todo/inline_postform_autotitles.mdwn | 3 +-- doc/todo/meta_rcsid.mdwn | 2 +- doc/todo/missingparents.pm.mdwn | 2 +- doc/todo/passwordauth:_sendmail_interface.mdwn | 2 +- doc/todo/should_optimise_pagespecs.mdwn | 2 +- doc/todo/tracking_bugs_with_dependencies.mdwn | 2 ++ doc/todo/unaccent_url_instead_of_encoding.mdwn | 2 +- 21 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 doc/patch/core.mdwn (limited to 'doc/bugs') diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn index 0edba438c..ceedbbdaa 100644 --- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn +++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn @@ -1,3 +1,5 @@ +[[!tag plugins/map patch]] + input: before. @@ -13,7 +15,7 @@ Presuming that the pagespec does not match, output: The UL element is not closed. -Patch[[!tag patch]]: +Patch: --- /usr/share/perl5/IkiWiki/Plugin/map.pm 2009-05-06 00:56:55.000000000 +0100 +++ IkiWiki/Plugin/map.pm 2009-06-15 12:23:54.000000000 +0100 diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn index 042d6a20c..be14e5126 100644 --- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn +++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn @@ -1,3 +1,5 @@ +[[!tag patch plugins/inline patch/core]] + The `IkiWiki::pagetitle` function does not respect title changes via `meta.title`. It really should, so that links rendered with `htmllink` get the proper title in the link text. --[[madduck]] @@ -5,7 +7,7 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title ---- It is possible to set a Page-Title in the meta-plugin, but that one isn't -reused in parentlinks. This [[patch]] may fix it. +reused in parentlinks. This patch may fix it.
        • I give pagetitle the full path to a page. @@ -132,7 +134,7 @@ diff -c /usr/share/perl5/IkiWiki/Plugin/meta.pm.distrib /usr/share/perl5/IkiWiki > >> It was actually more complicated than expected. A working prototype is >> now in my `meta` branch, see my userpage for the up-to-date url. ->> Thus tagging [[patch]]. --[[intrigeri]] +>> Thus tagging patch. --[[intrigeri]] >> >>> Joey, please consider merging my `meta` branch. --[[intrigeri]] diff --git a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn index dace2ca19..08af5fe2c 100644 --- a/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn +++ b/doc/bugs/search_for_locale_data_in_the_installed_location.mdwn @@ -11,7 +11,7 @@ It seems like gettext only searches for locale information in /usr/share/locale, return $gettext_obj->get(shift); } -[[!tag patch]] +[[!tag patch patch/core]] -- [[ThomasBleher]] > According to my testing, this patch makes ikiwiki's localisation fail for diff --git a/doc/patch/core.mdwn b/doc/patch/core.mdwn new file mode 100644 index 000000000..fcf0bdb72 --- /dev/null +++ b/doc/patch/core.mdwn @@ -0,0 +1,7 @@ +Some [[patches|patch]] affect the ikiwiki core, rather than just a plugin. +This tag collects those patches. Please tag such patches with 'patch/core' +as well as 'patch'. + +[[!inline pages="(todo/* or bugs/*) and link(patch/core) + and !link(bugs/done) and !link(todo/done) and !*/Discussion" + rootpage="todo" archive="yes"]] diff --git a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn index 8ecdf36d0..e5ac391c3 100644 --- a/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn +++ b/doc/todo/Add_DATE_parameter_for_use_in_templates.mdwn @@ -83,4 +83,4 @@ regenerate this one against that). -- 1.5.2.2 -[[!tag patch]] +[[!tag patch patch/core plugins/inline]] diff --git a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn index be4249460..bf8de16cd 100644 --- a/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn +++ b/doc/todo/Bestdir_along_with_bestlink_in_IkiWiki.pm.mdwn @@ -48,4 +48,4 @@ This patch adds function bestdir() which returns best directory from the directo ---- -[[users/arpitjain]] -[[!tag patch]] +[[!tag patch patch/core]] diff --git a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn index 89167c084..4bc828e6e 100644 --- a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn +++ b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn @@ -1,4 +1,4 @@ -[[!tag patch]] +[[!tag patch plugins/calendar]] Here's my next version of the patch - still a work in progress. diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 97515a312..893498f2c 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -1,8 +1,10 @@ +[[!tag plugins/meta patch]] + I'd like to define [[plugins/meta]] values to apply across all pages site-wide unless the pages define their own: default values for meta definitions essentially. -Here's a patch[[!tag patch]] to achieve this (also in the "defaultmeta" branch of +Here's a patch to achieve this (also in the "defaultmeta" branch of my github ikiwiki fork): diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index f60fc3d6e..f1d33114f 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -4,7 +4,7 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte Also see: and -[[!tag wishlist]] +[[!tag wishlist plugins/tag patch]] I would love to see this as well. -- dato diff --git a/doc/todo/blogpost_plugin.mdwn b/doc/todo/blogpost_plugin.mdwn index bb91ffd02..69df27271 100644 --- a/doc/todo/blogpost_plugin.mdwn +++ b/doc/todo/blogpost_plugin.mdwn @@ -153,4 +153,4 @@ Index: IkiWiki.pm our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE -[[!tag patch]] +[[!tag patch patch/core]] diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index 15efab70c..968279113 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -12,7 +12,7 @@ qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//], wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/, -[[!tag patch]] +[[!tag patch patch/core]] This lets the site administrator have a `.htaccess` file in their underlay directory, say, then get it copied over when the wiki is built. Without @@ -52,5 +52,3 @@ It should be off by default of course. --Max --- +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]] - -[[!tag patch]] diff --git a/doc/todo/format_escape.mdwn b/doc/todo/format_escape.mdwn index 574883d1b..762f16646 100644 --- a/doc/todo/format_escape.mdwn +++ b/doc/todo/format_escape.mdwn @@ -97,7 +97,7 @@ I've created an updated [patch](http://www.idletheme.org/code/patches/ikiwiki-fo --Ryan Koppenhaver ## Original patch -[[!tag patch]] +[[!tag patch patch/core plugins/rst]]
           Index: debian/changelog
          diff --git a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
          index a6a6ec1e1..7cf37fbb9 100644
          --- a/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
          +++ b/doc/todo/hard-coded_location_for_man_pages_and_w3m_cgi_wrapper.mdwn
          @@ -12,7 +12,7 @@ while the default stays as it is now.
           > INSTALLMAN1DIR (though MakeMaker lacks one for man8). I'd prefer not
           > adding new variables where MakeMaker already has them. --[[Joey]]
           
          -[[!tag patch]]
          +[[!tag patch patch/core]]
           
           
           
          diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
          index fc575e013..336ae38d6 100644
          --- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
          +++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
          @@ -1,5 +1,5 @@
          -A [[patch]] in my git repository (the inline-pagenames branch) adds the following
          -parameter to the [[ikiwiki/directive/inline]] directive:
          +A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
          +the following parameter to the [[ikiwiki/directive/inline]] directive:
           
           > * `pagenames` - If given instead of `pages`, this is interpreted as a
           >    space-separated list of links to pages (with the same
          @@ -10,3 +10,5 @@ parameter to the [[ikiwiki/directive/inline]] directive:
           This is on my [[wishlist]] for my [[plugins/contrib/album]] plugin, which currently
           uses it internally (as it has already collected the pages in order). It could also
           be useful for other things, like [[todo/wikitrails]]. --[[smcv]]
          +
          +[[!tag plugins/inline]]
          diff --git a/doc/todo/inline_postform_autotitles.mdwn b/doc/todo/inline_postform_autotitles.mdwn
          index 5005208be..b3366f60e 100644
          --- a/doc/todo/inline_postform_autotitles.mdwn
          +++ b/doc/todo/inline_postform_autotitles.mdwn
          @@ -1,5 +1,4 @@
          -[[!tag wishlist]]
          -[[!tag patch]]
          +[[!tag wishlist patch plugins/inline]]
           
           for postforms in inlines of pages which follow a certain scheme, it might not
           be required to set the title for each individual post, but to automatically set
          diff --git a/doc/todo/meta_rcsid.mdwn b/doc/todo/meta_rcsid.mdwn
          index 158edea6e..9e112317f 100644
          --- a/doc/todo/meta_rcsid.mdwn
          +++ b/doc/todo/meta_rcsid.mdwn
          @@ -1,4 +1,4 @@
          -The following patch adds an 'rcsid' parameter to the Meta plugin, to allow inclusion 
          +The following patch adds an 'rcsid' parameter to the [[!taglink plugins/Meta]] plugin, to allow inclusion 
           of CVS/SVN-style keywords (like '$Id$', etc.) from the source file in the page template.
           
           > So the idea is you'd write something like:
          diff --git a/doc/todo/missingparents.pm.mdwn b/doc/todo/missingparents.pm.mdwn
          index c5f2ab535..cecac7a94 100644
          --- a/doc/todo/missingparents.pm.mdwn
          +++ b/doc/todo/missingparents.pm.mdwn
          @@ -258,4 +258,4 @@ Index: IkiWiki.pm
            	my $page=shift;
           
          -[[!tag patch]] +[[!tag patch patch/core]] diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn index 9598af234..770c4825a 100644 --- a/doc/todo/passwordauth:_sendmail_interface.mdwn +++ b/doc/todo/passwordauth:_sendmail_interface.mdwn @@ -1,4 +1,4 @@ -[[!tag wishlist]] +[[!tag wishlist plugins/passwordauth]] For sending out password reminder emails, the [[plugins/passwordauth]] plugin currently uses the *[Mail::Sendmail](http://search.cpan.org/perldoc?Mail::Sendmail)* module. diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index c5485477f..61458d972 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -96,4 +96,4 @@ 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]] -[[!tag wishlist patch]] +[[!tag wishlist patch patch/core]] diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn index 3a761731b..80aaf3c39 100644 --- a/doc/todo/tracking_bugs_with_dependencies.mdwn +++ b/doc/todo/tracking_bugs_with_dependencies.mdwn @@ -1,3 +1,5 @@ +[[!tag patch patch/core]] + I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so on several wikis. However, as far as I can tell, ikiwiki has no functionality which can represent dependencies between bugs and allow pagespecs to select based on dependencies. For instance, I can't write a pagespec which selects all bugs with no dependencies on bugs not marked as done. --[[JoshTriplett]] > I started having a think about this. I'm going to start with the idea that expanding diff --git a/doc/todo/unaccent_url_instead_of_encoding.mdwn b/doc/todo/unaccent_url_instead_of_encoding.mdwn index 1be150a82..d74b632bd 100644 --- a/doc/todo/unaccent_url_instead_of_encoding.mdwn +++ b/doc/todo/unaccent_url_instead_of_encoding.mdwn @@ -6,4 +6,4 @@ This is a one liner change, but requires a bit of reordering in the code. [[cstamas]] -[[!tag wishlist patch]] +[[!tag wishlist patch patch/core]] -- cgit v1.2.3