diff -Nru ikiwiki-3.20111107ubuntu1/CHANGELOG ikiwiki-3.20111229ubuntu1/CHANGELOG --- ikiwiki-3.20111107ubuntu1/CHANGELOG 2011-12-11 13:58:13.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/CHANGELOG 2012-01-18 14:23:53.000000000 +0000 @@ -1,3 +1,22 @@ +ikiwiki (3.20111229ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Angel Abad Wed, 18 Jan 2012 15:22:24 +0100 + +ikiwiki (3.20111229) unstable; urgency=low + + * Consume all stdin when rcs_receive short-circuits, + to avoid git SIGPIPE race. + * Add path and path_natural sort orders (smcv) + * Test coverage can be checked with `make coverage` (smcv) + * tag: encode categories using numeric values. (tango) + + -- Joey Hess Thu, 29 Dec 2011 12:00:53 -0400 + ikiwiki (3.20111107ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: diff -Nru ikiwiki-3.20111107ubuntu1/debian/changelog ikiwiki-3.20111229ubuntu1/debian/changelog --- ikiwiki-3.20111107ubuntu1/debian/changelog 2011-12-11 13:58:13.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/debian/changelog 2012-01-18 14:23:53.000000000 +0000 @@ -1,3 +1,22 @@ +ikiwiki (3.20111229ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Angel Abad Wed, 18 Jan 2012 15:22:24 +0100 + +ikiwiki (3.20111229) unstable; urgency=low + + * Consume all stdin when rcs_receive short-circuits, + to avoid git SIGPIPE race. + * Add path and path_natural sort orders (smcv) + * Test coverage can be checked with `make coverage` (smcv) + * tag: encode categories using numeric values. (tango) + + -- Joey Hess Thu, 29 Dec 2011 12:00:53 -0400 + ikiwiki (3.20111107ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: diff -Nru ikiwiki-3.20111107ubuntu1/debian/control ikiwiki-3.20111229ubuntu1/debian/control --- ikiwiki-3.20111107ubuntu1/debian/control 2011-12-11 05:34:12.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/debian/control 2012-01-09 06:38:24.000000000 +0000 @@ -14,7 +14,6 @@ Standards-Version: 3.9.2 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ -Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/attachment:_failed_to_get_filehandle.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/attachment:_failed_to_get_filehandle.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/attachment:_failed_to_get_filehandle.mdwn 2011-12-11 05:33:31.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/attachment:_failed_to_get_filehandle.mdwn 2012-01-09 06:37:51.000000000 +0000 @@ -44,7 +44,7 @@ >>>>>> $CGI::VERSION='3.15'; >>>>> I've just checked in a fix that should work, can you test it? ->>>>> [diff](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=71f10579c00a8ddc20ada1a1efd33aac25a3da7e) --[[Joey]] +>>>>> 71f10579c00a8ddc20ada1a1efd33aac25a3da7e --[[Joey]] >>>>>> I've patched `attachment.pm` module, but the bug still occurs. >>>>>> However I can see a little progress. I changed invoking `error()` @@ -63,7 +63,7 @@ >>>>>>> though. I've checked in a second try at dealing with things, can >>>>>>> you try it? --[[Joey]] ->>>>>>>> Do you mean that [diff](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=66f35e30dcea03c631a293e2341771277543b4ae)? +>>>>>>>> Do you mean that 66f35e30dcea03c631a293e2341771277543b4ae? >>>>>>>> If so, then it causes "Internal Server Error" for me: >>>>>>>> Can't use string ("test.txt") as a symbol ref while "strict refs" in use at /usr/share/perl5/IkiWiki/Plugin/attachment.pm line 144. diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn 2011-12-14 21:01:21.000000000 +0000 @@ -0,0 +1,4 @@ +This is possibly/probably due to my weird setup, which is that I have apache behind nginx, with the result that apache sees the client's IPv4 address as having been mapped to IPv6. i.e. ::ffff:10.11.12.13. That being the case, I currently need to specify that (with the ::ffff: prepended) if I want to whitelist (or more importantly blacklist) and IPv4 address. + +It strikes me that this is liable to become more of a problem as people finally start using IPv6, so it might be worth ensuring that the code that compares IP addresses be able to treat the two formats (with and without the ffff's) as equivalent. --[[fil]] + diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn 2011-12-17 19:08:29.000000000 +0000 @@ -0,0 +1,3 @@ +phil hands is kindly hosting rhombus-tech.net on an h-branchable ikiwiki. openid has been enabled, for convenience. unfortunately... :/etc/ikiwiki-hosting/ikiwiki-hosting.conf has an openid realm of "http://*.hands.com" which is kinda important (i assume) for security reasons. however this conflicts with what openid requires. openid logins are now specifying the realm of http://*.hands.com which of course doesn't match with http://rhombus-tech.net - it all goes pear-shaped from there. + +any ideas? thanks folks. diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn 2011-12-11 05:33:36.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn 2012-01-09 06:37:56.000000000 +0000 @@ -1,5 +1,5 @@ I can't check the last changes in Ikiwiki using -[gitweb](http://git.ikiwiki.info/?p=ikiwiki). It looks like XML +gitweb. It looks like XML validation problem with HTML entity. When I click a appropriate link on a [[git]] page, then I can only @@ -12,8 +12,8 @@ > as the diff links in RecentChanges, both seem to be working. --[[Joey]] >> Hm. It's strange. I really could see the error message like above ->> when I sent my report. It seems that ->> URL works now. So, we should be happy that it was self-fixed bug ;) +>> when I sent my report. It seems that +>> works now. So, we should be happy that it was self-fixed bug ;) >> --[[Paweł|ptecza]] >>> If it happens again, maybe take a full dump of the page? [[done]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/bzr-update-syntax-error.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/bzr-update-syntax-error.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/bzr-update-syntax-error.mdwn 2011-12-11 05:33:30.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/bzr-update-syntax-error.mdwn 2012-01-09 06:37:50.000000000 +0000 @@ -1,4 +1,4 @@ -On [Line #46 of the `bzr` plugin](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Rcs/bzr.pm;h=526036bf36e0ce5ec6fab47cb8a46991d2ebe0b2;hb=HEAD#l46) there's a mistalke. Instead of: +On Line #46 of the `bzr` plugin there's a mistalke. Instead of: my @cmdline = ("bzr", $config{srcdir}, "update"); diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn 2011-12-11 05:33:31.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn 2012-01-09 06:37:51.000000000 +0000 @@ -1,4 +1,4 @@ -Example (from [here](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)): +Example: 
 [[`\[[!taglink TAG\]\]`|plugins/tag]]
diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/img_vs_align.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/img_vs_align.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/img_vs_align.mdwn 2011-12-11 05:33:35.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/img_vs_align.mdwn 2012-01-09 06:37:55.000000000 +0000 @@ -5,7 +5,7 @@ hand, CSS is supposed to be used instead, I guess. (But how... I forgot almost of my CSS foo again ;-) it seems.) --[[tschwinge]] -> [[!img logo/ikiwiki.png align=right]]The [img tag doesn't create P tags](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Plugin/img.pm;h=32023fa97af8ba8e63192cacaff10a4677d20654;hb=HEAD), but if you have surrounded the img directive with newlines, they will result in paragraph tags. +> [[!img logo/ikiwiki.png align=right]]The img tag doesn't create P tags, but if you have surrounded the img directive with newlines, they will result in paragraph tags. > > I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]] > -- [[Jon]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn 2011-12-11 05:33:30.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn 2012-01-09 06:37:50.000000000 +0000 @@ -20,7 +20,7 @@ > or give any information to reproduce the bug. > > My guess: A version older than 3.20100403, which included -> [this bugfix](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=799b93d258bad917262ac160df74136f05d4a451), +> 799b93d258bad917262ac160df74136f05d4a451, > which could lead to incorrect "syntax error in pagespec" > that only happened some of the time. > diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn 2011-12-11 05:33:29.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn 2012-01-09 06:37:49.000000000 +0000 @@ -1,4 +1,4 @@ -The final `` in [`recentchanges.tmpl`][tmpl] gets wrapped in a +The final `` in `recentchanges.tmpl` gets wrapped in a `

` tag for some reason, resulting in the following invalid XHTML at the end of the [[RecentChanges]] page @@ -17,7 +17,6 @@ See the [validator output][validate] for more details. - [tmpl]: http://git.ikiwiki.info/?p=ikiwiki;a=blob_plain;f=templates/recentchanges.tmpl;hb=HEAD [validate]: http://validator.w3.org/check?uri=http://ikiwiki.info/recentchanges/ - - - diff -Nru ikiwiki-3.20111107ubuntu1/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn ikiwiki-3.20111229ubuntu1/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn --- ikiwiki-3.20111107ubuntu1/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn 2011-12-04 01:47:38.000000000 +0000 @@ -0,0 +1,24 @@ +My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly. +My doc/index.mdwn just has a line or two of plain text. +When I try to edit that page in w3m, it works fine until I push [Save Page]. +Then I just get a page that only contains "403". + +ikiwiki version is 3.20110715ubuntu1. +w3m is 0.5.3. + +-- [[terry|tjgolubi]] + +I made it work, though probably not completely, by renaming +~/.ikiwiki/wrappers/ikiwiki.cgi to ikiwiki2.cgi and replacing it with: + + #!/bin/bash + /home/tjgolubi/.ikiwiki/wrappers/ikiwiki2.cgi $* | sed -e 's,http://localhost,file://,g' + +I'm afraid that this hack may have bad side-effects, but I hope it points you to the cause/solution. +Of course, the next time I rerun ikiwiki --setup, it will overwrite my wrapper-wrapper. + +-- [[terry|tjgolubi]] + +I made a logfile of all the args, env, and stdin/stdout to/from my wrapper. If you're interested, I'll email it to you. I wasn't able to attach it here. + +-- [[terry|tjgolubi]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/examples.mdwn ikiwiki-3.20111229ubuntu1/doc/examples.mdwn --- ikiwiki-3.20111107ubuntu1/doc/examples.mdwn 2011-12-11 05:33:21.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/examples.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -9,4 +9,4 @@ files into your wiki to start using one of the examples. The [[tips]] page has some other ideas for ways to use ikiwiki, and the -[[css_market]] has some example stylesheets to change ikiwiki's look. +[[css_market]] and [[theme market|themes]] has some example stylesheets to change ikiwiki's look. diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 1" + date="2011-12-20T07:21:19Z" + content=""" +If I try to create new setup file + + $ ikiwiki --dumpsetup newpages.setup + Traceback (most recent call last): + File \"/usr/lib/ikiwiki/plugins/rst\", line 18, in + from docutils.core import publish_parts; + ImportError: No module named docutils.core +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-20T15:16:23Z" + content=""" +Your setup file seems to refer to a \"scrubber\" plugin, which has never existed in ikiwiki. Perhaps a typo of \"htmlscrubber\"? + +3.20100815.7 is an old version of ikiwiki. The current version avoids the rst docutils breakage. Installing python-docutils on Debian can work around that problem as well. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 3" + date="2011-12-20T16:58:23Z" + content=""" +Thanks. That was exactly the issue. When editing my setup file, I accidentally splitted `htmlscrubber` to `html` and `scrubber`. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,10 @@ +I upgraded my Debian server from 5 to 6, then I updated ikiwiki. Now I can't rebuild my Ikiwiki instance: + + $ ikiwiki --setup ./pages.setup + Failed to load plugin IkiWiki::Plugin::scrubber: Can't locate IkiWiki/Plugin/scrubber.pm in @INC (@INC contains: /home/xyzfoobar/devel/ikiwiki/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 77) line 2. + BEGIN failed--compilation aborted at (eval 77) line 2. + + $ ikiwiki --version + ikiwiki version 3.20100815.7 + +What's the proper way to fix this? diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment ikiwiki-3.20111229ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment 2011-11-30 20:49:19.000000000 +0000 @@ -0,0 +1,166 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" + nickname="Matt" + subject="comment 3" + date="2011-11-30T20:42:55Z" + content=""" +I got to grip with things to make a patch to do this. :-) + +Here it is in case of use to anyone. + +

+From f0554c5b61e1915086d5cf071f095ff233c2590d Mon Sep 17 00:00:00 2001
+From: Matt Ford 
+Date: Wed, 30 Nov 2011 19:40:10 +0000
+Subject: [PATCH] Patch to allow daily archival generation and link to them in
+ the calendar
+
+---
+ IkiWiki/Plugin/calendar.pm   |   17 ++++++++++++++++-
+ ikiwiki-calendar.in          |   34 +++++++++++++++++++++++++++++++---
+ templates/calendarday.tmpl   |    5 +++++
+ templates/calendarmonth.tmpl |    2 +-
+ templates/calendaryear.tmpl  |    2 +-
+ 5 files changed, 54 insertions(+), 6 deletions(-)
+ create mode 100644 templates/calendarday.tmpl
+
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index c7d2b7c..9999c03 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -47,6 +47,13 @@ sub getsetup () {
+ 			safe => 1,
+ 			rebuild => 1,
+ 		},
++		archiveday => {
++			type => \"boolean\",
++			example => 1,
++			description => \"enable archiving on a daily basis (otherwise monthly)\",
++			safe => 1,
++			rebuild => 1,
++		},
+ 		archive_pagespec => {
+ 			type => \"pagespec\",
+ 			example => \"page(posts/*) and !*/Discussion\",
+@@ -222,11 +229,19 @@ EOF
+ 				$tag='month-calendar-day-link';
+ 			}
+ 			$calendar.=qq{\t\t};
+-			$calendar.=htmllink($params{page}, $params{destpage}, 
++			if (exists $pagesources{\"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day)}) {
++				$calendar.=htmllink($params{page}, $params{destpage}, 
++						\"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day),
++						noimageinline => 1,
++						linktext => \"$day\",
++						title => \"$key\");
++			}else{
++				$calendar.=htmllink($params{page}, $params{destpage}, 
+ 				$linkcache{$key},
+ 				noimageinline => 1,
+ 				linktext => $day,
+ 				title => pagetitle(IkiWiki::basename($linkcache{$key})));
++			}
+ 			$calendar.=qq{\n};
+ 		}
+ 		else {
+diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
+index 037ef7d..af22bc5 100755
+--- a/ikiwiki-calendar.in
++++ b/ikiwiki-calendar.in
+@@ -30,21 +30,44 @@ IkiWiki::checkconfig();
+ my $archivebase = 'archives';
+ $archivebase = $config{archivebase} if defined $config{archivebase};
+ 
++my $archiveday = 0;
++$archiveday = $config{archiveday} if defined $config{archiveday};
++
+ if (! defined $pagespec) {
+ 	$pagespec=$config{archive_pagespec} || \"*\";
+ }
+ 
+-sub writearchive ($$;$) {
++sub is_leap_year {
++	my $year=shift;
++	return ($year % 4 == 0 && (($year % 100 != 0) || $year % 400 == 0));
++}
++
++sub month_days {
++	my $month=shift;
++        my $year=shift;
++	my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$month-1];
++	if ($month == 2 && is_leap_year($year)) {
++		$days_in_month++;
++	}
++	return $days_in_month;
++}
++
++sub writearchive ($$;$;$) {
+ 	my $template=template(shift);
+ 	my $year=shift;
+ 	my $month=shift;
++        my $day=shift;
+ 
+-	my $page=defined $month ? \"$year/$month\" : $year;
++	my $page;
++        if (defined $year)  {$page = \"$year\"};
++        if (defined $month) {$page = \"$year/$month\"};
++        if (defined $day)   {$page = \"$year/$month/$day\"};
+ 
+ 	my $pagefile=newpagefile(\"$archivebase/$page\", $config{default_pageext});
+ 	$template->param(pagespec => $pagespec);
+ 	$template->param(year => $year);
+ 	$template->param(month => $month) if defined $month;
++	$template->param(day => $day) if defined $day;
+ 
+ 	if ($force || ! -e \"$config{srcdir}/$pagefile\") {
+ 		writefile($pagefile, $config{srcdir}, $template->output);
+@@ -54,8 +77,13 @@ sub writearchive ($$;$) {
+ 
+ foreach my $y ($startyear..$endyear) {
+ 	writearchive(\"calendaryear.tmpl\", $y);
+-	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
++	foreach my $m (map {sprintf(\"%02d\",$_)} (1..12)) {
+ 		writearchive(\"calendarmonth.tmpl\", $y, $m);
++		if ($archiveday ) {
++			foreach my $d (map {sprintf(\"%02d\",$_)} (1..month_days($m,$y))) {
++				writearchive(\"calendarday.tmpl\", $y, $m, $d);
++			}
++		}
+ 	}
+ }
+ 
+diff --git a/templates/calendarday.tmpl b/templates/calendarday.tmpl
+new file mode 100644
+index 0000000..ac963b9
+--- /dev/null
++++ b/templates/calendarday.tmpl
+@@ -0,0 +1,5 @@
++[[!sidebar content=\"\"\"
++[[!calendar type=month month= year= pages=\"\"]]
++\"\"\"]]
++
++[[!inline pages=\"creation_day() and creation_month() and creation_year() and \" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
+index 23cd954..c998c16 100644
+--- a/templates/calendarmonth.tmpl
++++ b/templates/calendarmonth.tmpl
+@@ -2,4 +2,4 @@
+ [[!calendar type=month month= year= pages=\"\"]]
+ \"\"\"]]
+ 
+-[[!inline pages=\"creation_month() and creation_year() and \" show=0 feeds=no reverse=yes]]
++[[!inline pages=\"creation_month() and creation_year() and \" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendaryear.tmpl b/templates/calendaryear.tmpl
+index 714bd6d..b6e33c5 100644
+--- a/templates/calendaryear.tmpl
++++ b/templates/calendaryear.tmpl
+@@ -1 +1 @@
+-[[!calendar type=year year= pages=\"\"]]
++[[!calendar type=year year= pages=\"\" archive=\"yes\"]]
+-- 
+1.7.7.3
+
+:
+
+
+"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment ikiwiki-3.20111229ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-22T16:15:34Z" + content=""" +That error message means that the user has logged in, but the lockedit plugin has been configured, via `locked_pages` to not let some pages be edited by them. + +Inability to log in with openid is a separate problem, I can only guess as you didn't say how it fails when you try to log in by openid, but perhaps you need to install the Net::OpenID::Consumer perl module from cpan. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,5 @@ +I find that users can't login my Ikiwiki instance using Google, or openID, but can use Ikiwiki user name and password to login. + +Using the two formers get error + + Error: ... is locked and cannot be edited diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment 2011-12-04 01:47:39.000000000 +0000 @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 1" + date="2011-12-03T17:17:57Z" + content=""" +with \"no question mark to it\" means \"being no link (target exists) AND with no question mark to it\" +thx +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment 2011-12-04 01:47:39.000000000 +0000 @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 3" + date="2011-12-03T17:25:58Z" + content=""" +One more thing: my syntax with the above post is not correct - the linking syntax was/is + + \[[somename|path/from/website/root/dir/filename]] + +ie. I got one slash too much above. + +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn 2011-12-04 01:47:38.000000000 +0000 @@ -0,0 +1,24 @@ +Hi, + +today I encountered a strange behaviour of ikiwiki that I'm trying to understand... + +I linked to a subpage using + +\[[somename|/path/from/root/dir/filename]] + +and saved the file. Then I added it to the repo, committed it, and ran + + ikiwiki --setup setupfile.setup + +Afterwards some older links of the same style were displayed correctly, but one new link remained black - i.e. with no question mark to it. I figure that means ikiwiki has recognized the syntax but did not create a link in the html file. + +I messed around a bit, recompiling many times did not work. After a while I opened the file via the web editing formular and saved it from there ("Save Page"). + +After that the link was there. + +I dont know why. My question is - what does ikiwiki do differently when saved from the web form than when saving an editor and then running ikiwiki --setup setupfile.setup. + +Btw. my version is still 3.20100815.7 since I'm on squeeze and like to stick with the repo versions. + +Thanks in advance, +Chris diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="What are the permissions?" + date="2011-12-28T19:35:25Z" + content=""" +What exactly are the permissions for the lockfile and the directory it is in? + +What user is the ikiwiki running as? +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 2" + date="2011-12-28T23:06:06Z" + content=""" + +stat -c '%A %a %U %G %n' myiki2 myiki1 +drwxr-xr-x 755 user user myiki2 +drwxr-xr-x 755 user user myiki1 + +stat -c '%A %a %U %G %n' myiki2/.ikiwiki myiki1/.ikiwiki +drwxr-xr-x 755 user user myiki2/.ikiwiki +drwxr-xr-x 755 user user myiki1/.ikiwiki + +stat -c '%A %a %U %G %n' myiki2/.ikiwiki/lockfile myiki1/.ikiwiki/lockfile +-rw-r--r-- 644 user user myiki2/.ikiwiki/lockfile +-rw-r--r-- 644 user user myiki1/.ikiwiki/lockfile + + +As you see, myiki2 has the same permissions as myiki1, but myiki1 works. + +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,5 @@ +I installed a new wiki on my local machine. When I click on edit, I get the following error: + +`Error: cannot write to /home/user/myiki2/.ikiwiki/lockfile: Permission denied` + +I checked the permissions of that file and assured that they are the same as in my other working ikiwiki, but it doesn't help. Any idea? diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment ikiwiki-3.20111229ubuntu1/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="intrigeri" + ip="88.80.28.70" + subject="Please upgrade" + date="2011-12-20T09:34:56Z" + content=""" +You seem to be using an older version of ikiwiki. Either use a hash ref (see [old documentation](http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/plugins/po.mdwn;h=c36414c8e85f5bb11e2c3a7c3bd41e829abe15a6;hp=53327c1dae94ef5896119cc874133a9a3c1a9b4e;hb=862fc7c1ab1f7d709561bcb02fc8ede57b90a51b;hpb=e50df5ea7601b6a1fc03994650ddff728aba7b57)) or upgrade. + +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/How_to_configure_po_plugin__63__.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/How_to_configure_po_plugin__63__.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/How_to_configure_po_plugin__63__.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/How_to_configure_po_plugin__63__.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,21 @@ +I put + + # po plugin + po_master_language => 'en|English', + + po_slave_languages => [ 'zh|Chinese'] + + +in page.setup. And did + + $ikiwiki --setup ./page.setup + +but get errors: + + Can't use string ("en|English") as a HASH ref while "strict refs" in use at /usr/share/perl5/IkiWiki/Plugin/po.pm line 162. + +Line 162 of the file reads + + delete $config{po_slave_languages}{$config{po_master_language}{code}};; + +What's wrong? How to fix it? diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn 2011-12-11 05:33:40.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Re [Let's just rely on backlinks for this?](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/pagespec/discussion.mdwn;h=4eed3722ccc744595fc8380e68e69dc9e1ad6450;hp=f4fdd764ed61c34c09af9df046a1a134b7d0ffe6;hb=a4ce0468f6f562ad4ec749f156528aa5b3f2fe39;hpb=23a4ee6d15dbd9b8e8c6588a829dd30a26a8de32) and [2](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/wikilink/discussion.mdwn;h=0677ff7ded6a86be7d010dfd97affdb6b266832a;hp=274c8aaf1d075adbf3b76496e1945348aefe836a;hb=4f4666c4ae5cdf5e04ac42cc52a97d90e978adb0;hpb=a4ce0468f6f562ad4ec749f156528aa5b3f2fe39): - -I simply didn't notice there is an "add a new bug" form at [[bugs]], so I used the obvious way to create a page through the web-interface: to put first a wikilink pointing at the new page. --Ivan Z. diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment 2011-12-25 00:10:20.000000000 +0000 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-25T00:07:28Z" + content=""" +Try running the post-update hook by hand and see if it pulls the changes into ~/wiki/wiki.src and see if it updates the site. + +Make sure `gitorigin_branch` is set in the setup file. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment 2011-12-27 16:33:21.000000000 +0000 @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="comment 2" + date="2011-12-27T16:18:31Z" + content=""" +In both old and new host gitorigin_branch is empty string in ikiwiki.setup. + + tale@tugelbend:~$ grep -i gitorigin ikiwiki.setup + gitorigin_branch => '', + +The branches subdir is empty on both hosts: + + tale@tugelbend:~$ LANG=C ls -lha wiki/src.git/branches/ + total 8.0K + drwxr-xr-x 2 tale tale 4.0K Dec 24 2009 . + drwxr-xr-x 7 tale tale 4.0K Dec 24 2009 .. + tale@tugelbend:~$ + +I do not know what value I should assign to gitorigin_branch. + +I tried + + wiki.git/hooks/post-update + +but nothing seems to happen. No output, web page stays the same. File timestamps are not updated +on the dest directory. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="Editing via browser works" + date="2011-12-27T18:47:16Z" + content=""" +I now set up virtual host in apache2 and fudged the ipnumber to correspond to hostnames the ikiwiki uses. I do not want to update DNS before I have checked the site works. + +Now I can log in using OpenID and edit the wiki via browser. This time the web pages are updated and the changes I made appear in the wiki. + +I cheched the gitorigin_branch setting was empty string even in 2009 when I got this wiki. I begin to suspect editing the wiki using a git checkout would not work even in the host the ikiwiki is currently running on, and maybe did not work in the host it was running on in 2009. + +It looks to me like ikiwiki is working on this new host except git configuration is somehow messed up. It is possible I never did use git checkout on the old host. + +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="Checked old host, git messed up there, too" + date="2011-12-27T18:59:38Z" + content=""" +I did + git clone src.git +on the host ikiwiki is currently running on, and got an old version of the wiki, not the one that is diplayed on the web page. + +So even there editing via browser works, but git checks out an old version and the changes I make do not get shown on the web page after git push. + +This new host I set up is thus no worse, actually slighty better now because git clone at least gets me the sources the web pages are generated from. + +How to figure out what is wrong with ikiwiki setup in the using git part? +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="branch = master, still no luck" + date="2011-12-28T03:22:57Z" + content=""" +I learned from docs setting gitorigin_branch to empty string disables git pushing and pulling. So guessing + +gitorigin_branch => 'master', + +seemed a good idea. + +However, now ikiwiki -setup gives: + + taleman@porixi:~$ ikiwiki -setup ikiwiki.setup + successfully generated /var/www/ikiwiki/debian.fi/ikiwiki.cgi + successfully generated /home/taleman/wiki/wiki.git/hooks/post-update + fatal: 'master': unable to chdir or not a git archive + fatal: The remote end hung up unexpectedly + 'git pull master' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 195. + taleman@porixi:~$ +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn 2011-12-24 23:43:14.000000000 +0000 @@ -0,0 +1,27 @@ +I copied ikiwiki from old host to new. Old is Debian GNU/Linux version 5.0.7, with ikiwiki 3.1415926~bpo50+1 +New host is 5.0.8 with ikiwiki 3.20100815~bpo50+1 + +I have ikiwiki.setup and both GIT repos from old host, src and src.git, the latter is bare repo. + +I suspect I have messed up things in the old host, since the src directory tree is much larger than the src.git. +tale@tugelbend:~/wiki$ du -sh src src.git/ +8,3M src +2,6M src.git/ + +If I clone the src.git to the new host, I get after ikiwiki --setup web pages from year 2009. So I did the migration like this: + +Copy the src directory to the new host to temp dir; git clone --bare /tmp/Foo/src ~/wiki/wiki.git +cd ~/wiki +git clone wiki.git wiki.src +cd .. +ikiwiki --setup ikiwiki.setup + +I believe I have modified the ikiwiki.setup file correctly, I get no error messages and it makes the web page with the +same content as on old host. But when I git clone wiki.git a working copy for myself, and edit it, git commit -a ; git push +I am sad to see the web page is not updated. + +How can I see what is wrong? The hook seems OK: +taleman@porixi:~/wiki$ ls -lh wiki.git/hooks/post-update +-rwsr-sr-x 1 taleman taleman 14K 23.12. 17:42 wiki.git/hooks/post-update + +ikiwiki --setup created that and did not claim any errors. diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment 2011-12-24 23:43:14.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="When is ikiwiki --setup run?" + date="2011-12-23T13:49:54Z" + content=""" +Am I to run ikiwiki --setup after all the three steps? +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment ikiwiki-3.20111229ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment 2011-12-25 00:10:20.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 3" + date="2011-12-25T00:08:22Z" + content=""" +You run ikiwiki -setup when you have all the files in place for ikiwiki and would like it to rebuild the site and generate the wrappers. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,6 @@ +I've installed the po plugin. I'm still trying to figure out how to use it. + +I have a Ikiwiki instance with multiple existing pages in English. + +How do I use po to create alternative pages in slave languages for these existing pages? + diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/pandoc-iki_plugin.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/pandoc-iki_plugin.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/pandoc-iki_plugin.mdwn 2011-12-11 05:33:40.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/pandoc-iki_plugin.mdwn 2012-01-09 06:38:00.000000000 +0000 @@ -1,4 +1,4 @@ -I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See for details. +I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See for details. How do I get this added to the contrib section of the plugin list? --Profjim diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="jean_magnan" + ip="81.56.145.104" + subject="comment 1" + date="2011-12-19T10:20:59Z" + content=""" +Hi, +I have this line in the sidebar file, it says to show the titles and dates of the last 5 pages: + +[[!inline pages=\"*\" archive=\"yes\" show=\"5\"]] +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-20T15:13:48Z" + content=""" +The [[RecentChanges]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn 2011-12-14 21:01:21.000000000 +0000 @@ -0,0 +1 @@ +Is it possible to display the recent changes on the main site of the wiki or on a sidebar? diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment ikiwiki-3.20111229ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-22T16:12:42Z" + content=""" +Absolutely not. If you use ikiwiki-makerepo to set up ikiwiki, it makes a `.gitignore` containing `/.ikiwiki` + +The `.ikiwiki` directory is where ikiwiki stores all the state it needs to track about a given build of a wiki. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,14 @@ +In my local working copy, I discovered a .ikiwiki directory with files and subdirectories. What are they for in a working copy? Should them be committed to central repository (origin) on remote server? + + $ git status + # On branch master + # Changes to be committed: + # (use "git reset HEAD ..." to unstage) + # + # new file: .ikiwiki/commitlock + # new file: .ikiwiki/indexdb + # new file: .ikiwiki/lockfile + # new file: .ikiwiki/transient/recentchanges/change_0326ad7c7aa2c40b8db5d59033ecda7ed4d61295._change + + +Should these be committed and pushed? diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment 2011-12-04 01:47:39.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2011-12-03T19:45:06Z" + content=""" +The only thing I can think of is to clone the wiki, and for WikiA, delete PageB, and for WikiB, delete PageA. This won't remove the histories of those pages, but it will at least remove those pages. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment 2011-12-05 19:17:53.000000000 +0000 @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2011-12-04T13:37:27Z" + content=""" +If just deleting the unwanted pages is insufficient (e.g. perhaps they +contain information that must not be made public), you can split a git +repository (including ikiwiki repositories) with `git filter-branch` (see +[this stackoverflow question](http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository), +for instance). + +This preserves the history of each individual page, but rewrites the +entire history of the repository (it re-does every commit, pretending +that the addition of the omitted pages and every subsequent edit to +them had never happened); it's like `git rebase` but more so. + +As a result, existing branches will no longer be able to push to the +rewritten repository. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment 2011-12-05 19:17:53.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 3" + date="2011-12-04T14:03:55Z" + content=""" +@smcv: Thanks, that looks promising. The example from stackoverflow is with subdirectories. What do I have to change to match a list of single files (pages) instead? +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment 2011-12-09 17:18:51.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 4" + date="2011-12-09T09:21:05Z" + content=""" +I have put the question on stackoverflow: http://stackoverflow.com/questions/8443372/split-an-ikiwiki +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Split_a_wiki.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Split_a_wiki.mdwn 2011-12-04 01:47:39.000000000 +0000 @@ -0,0 +1,21 @@ +Is it possible to split an ikiwiki (with git backend) in to two? + +Suppose I have an ikiwiki called myiki + +which contains the pages + +pageA1,pageA2,...,pageB1,pageB2,... + +now I want to have two wikis called myikiA and myikiB + +such that + +myikiA contains pageA1,pageA2,... + +The history of myikiA should contain the whole history of those pages but no history of pageB1,pageB2,... + +and + +myikiB contains pageB1,pageB2,... + +The history of myikiB should contain the whole history of those pages but no history of pageA1,pageA2,... diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment ikiwiki-3.20111229ubuntu1/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment 2011-12-16 18:21:35.000000000 +0000 @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" + nickname="shobo" + subject="comment 8" + date="2011-12-16T13:21:57Z" + content=""" +URLs containing /ikiwiki.cgi/ are dynamically-generated pages; everything else is static. + +How is this possible? Where can I find more about this? + +Shobo, Junior Software Developer +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn 2011-12-04 01:47:39.000000000 +0000 @@ -0,0 +1,9 @@ +My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly. +My doc/index.mdwn just has a line or two of plain text. +When I try to edit that page in w3m, it works fine until I push [Save Page]. +Then I just get a page that only contains "403". + +ikiwiki version is 3.20110715ubuntu1. +w3m is 0.5.3. + +-- [[terry|tjgolubi]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment 2011-12-17 19:08:29.000000000 +0000 @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-16T18:51:16Z" + content=""" +Perhaps you should try a current verison of xapian, 1.2.7 works here. You don't say what version of the xapian perl module you have; 1.2.7.0 is working here. The \"postlist\" is an internal part of xapian AFAICS, not something that has to be explicitly set up, and it gets populated here. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment 2011-12-17 19:08:29.000000000 +0000 @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" + nickname="Matthew" + subject="comment 2" + date="2011-12-17T09:10:38Z" + content=""" +I'm using RPMs to install Xapian packages, xapian-omega and xapian-bindings-perl, and they're all 1.2.5. I originally tried building and installing Xapian 1.2.7 from source, but found that ikiwiki failed like this: + +
+Use of inherited AUTOLOAD for non-method Search::Xapian::DB_CREATE_OR_OPEN() is deprecated at /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/search.pm line 220.
+Can't locate auto/Search/Xapian/DB_CREATE_O.al in @INC (@INC contains: /home/mat/.ikiwiki /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/i386-linux-thread-multi /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8 /home/mexon/system/perl5lib /usr/lib/perl5/site_perl/5.8.8/i386-linux-thread-multi /usr/lib/perl5/site_perl/5.8.8 /usr/lib/perl5/site_perl /usr/lib/perl5/vendor_perl/5.8.8/i386-linux-thread-multi /usr/lib/perl5/vendor_perl/5.8.8 /usr/lib/perl5/vendor_perl /usr/lib/perl5/5.8.8/i386-linux-thread-multi /usr/lib/perl5/5.8.8 .) at /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/search.pm line 220
+
+ +Much fruitless googling later I found that there were these 1.2.5 RPMs lying around so I switched to those. If you know a solution to the DB_CREATE_O problem I could give 1.2.7 another go. +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment --- ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" + nickname="Matthew" + subject="comment 3" + date="2011-12-19T06:18:56Z" + content=""" +I had another go, this time with Xapian 1.2.8.0, and I finally got it working. The errors I was seeing earlier were because Xapian installs itself in /usr/local, but the default CentOS environment doesn't have /usr/local/lib in the LD_LIBRARY_PATH. As usual, the problem and solution are very duh, it's the error messages that make everything hard. It's a lot more clear if you do a \"make test\" while building Search::Xapian: + +
+mexon:~/ikiwiki-temp/Search-Xapian-1.2.8.0$ make test
+PERL_DL_NONLAZY=1 /usr/bin/perl \"-MExtUtils::Command::MM\" \"-e\" \"test_harness(0, 'blib/lib', 'blib/arch')\" t/*.t
+t/01use...............
+#   Failed test 'use Search::Xapian;'
+#   in t/01use.t at line 3.
+#     Tried to use 'Search::Xapian'.
+#     Error:  Can't load '/home/mexon/ikiwiki-temp/Search-Xapian-1.2.8.0/blib/arch/auto/Search/Xapian/Xapian.so' for module Search::Xapian: libxapian.so.22: cannot open shared object file: No such file or directory at /usr/lib/perl5/5.8.8/i386-linux-thread-multi/DynaLoader.pm line 230.
+#  at (eval 3) line 2
+# Compilation failed in require at (eval 3) line 2.
+# BEGIN failed--compilation aborted at t/01use.t line 3.
+# Looks like you failed 1 test of 3.
+
+ +So yeah. Worth noting that Xapian 1.2.5 is apparently broken with ikiwiki. Maybe some kind of warning? +"""]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table.mdwn ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table.mdwn --- ikiwiki-3.20111107ubuntu1/doc/forum/Xapian_search:_empty_postlist_table.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/forum/Xapian_search:_empty_postlist_table.mdwn 2011-12-16 18:21:35.000000000 +0000 @@ -0,0 +1,34 @@ +Hi, + +I'm trying to set up a personal wiki and I'm having trouble getting +search to work. All my searches give zero results. I eventually +figured out that the Xapian database that's being created has an empty +postlist table. The position and termlist tables are all fine, and +when I add new content to the wiki I can see the database is updated +and the search terms are in the position table in plaintext. But I +can't query for them, even using Xapian's command line tools. + +
+mexon:~/Test/.ikiwiki/xapian/default$ ls -l
+total 76
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:56 flintlock
+-rw-rw-r-- 1 mexon mexon    28 Dec 16 15:55 iamchert
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 position.baseA
+-rw-rw-r-- 1 mexon mexon 49152 Dec 16 15:55 position.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 postlist.baseA
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:55 postlist.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 record.baseA
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:55 record.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 termlist.baseA
+-rw-rw-r-- 1 mexon mexon 16384 Dec 16 15:55 termlist.DB
+mexon:~/Test/.ikiwiki/xapian/default$ delve -a .
+All terms in database:
+mexon:~/Test/.ikiwiki/xapian/default$ 
+
+ +I don't know how to debug from here. Clearly ikiwiki is doing +something right when it's building the database, but one of the tables +is missing. Can anyone guess what's wrong, or tell me where to start +troubleshooting? + +I'm using Centos 5. Xapian is version 1.2.5. Ikiwiki version 3.20111107. diff -Nru ikiwiki-3.20111107ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn ikiwiki-3.20111229ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn --- ikiwiki-3.20111107ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn 2011-12-11 05:33:39.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn 2012-01-09 06:37:59.000000000 +0000 @@ -7,10 +7,14 @@ * `mtime` - List pages with the most recently modified first. -* `title` - Order by title (page name). +* `title` - Order by title (page name), e.g. "z/a a/b a/c" + +* `path` - Order by page name including parents, e.g. "a/b a/c z/a" [[!if test="enabled(sortnaturally)" then=""" * `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +* `path_natural` - Like `path`, but numbers in the title are treated as such """]] [[!if test="enabled(meta)" then=""" * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` diff -Nru ikiwiki-3.20111107ubuntu1/doc/ikiwikiusers.mdwn ikiwiki-3.20111229ubuntu1/doc/ikiwikiusers.mdwn --- ikiwiki-3.20111107ubuntu1/doc/ikiwikiusers.mdwn 2011-12-11 05:33:21.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/ikiwikiusers.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -69,7 +69,6 @@ * [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. * [Apua IT](http://apua.se/) * [PDFpirate Community](http://community.pdfpirate.org/) -* [Banu](https://banu.com/) uses Ikiwiki for its website, to convert static Markdown pages into PHP scripts which are served along with non-Ikiwiki PHP generated contents. The static contents benefit from use of Ikiwiki's plugins. Ikiwiki is purely used as a CMS and no wiki or web-based editing is allowed. Ikiwiki is run offline, and the resulting scripts are uploaded using rsync to the website. * [Software in the Public Interest](http://spi-inc.org/) * [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/) * [The FreedomBox Foundation](http://www.freedomboxfoundation.org/) diff -Nru ikiwiki-3.20111107ubuntu1/doc/index.mdwn ikiwiki-3.20111229ubuntu1/doc/index.mdwn --- ikiwiki-3.20111107ubuntu1/doc/index.mdwn 2011-12-11 05:33:22.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/index.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -14,7 +14,7 @@ and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for discussions. -All wikis are supposed to have a [[SandBox]], so this one does too. +All wikis are supposed to have a [[sandbox]], so this one does too. This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. diff -Nru ikiwiki-3.20111107ubuntu1/doc/news/version_3.20110711.mdwn ikiwiki-3.20111229ubuntu1/doc/news/version_3.20110711.mdwn --- ikiwiki-3.20111107ubuntu1/doc/news/version_3.20110711.mdwn 2011-12-11 05:33:37.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/news/version_3.20110711.mdwn 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -ikiwiki 3.20110711 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Add build dep on python-support. Closes: #[633536](http://bugs.debian.org/633536) - * attachment: Bugfix to move upload attachments out of holding area - when saving. - * attachment: Bugfix for trying to attach files to a subpage of the index - page."""]] \ No newline at end of file diff -Nru ikiwiki-3.20111107ubuntu1/doc/news/version_3.20111107.mdwn ikiwiki-3.20111229ubuntu1/doc/news/version_3.20111107.mdwn --- ikiwiki-3.20111107ubuntu1/doc/news/version_3.20111107.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/news/version_3.20111107.mdwn 2011-11-30 20:53:08.000000000 +0000 @@ -0,0 +1,12 @@ +ikiwiki 3.20111107 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * img: Bugfix to width/height tags for scaled down image when only + one dimension was provided. Thanks, Per Carlson. + * editpage: Fix FormattingHelp link on Discussion pages. + * The umask setting can now be set to private, group, or public, + avoiding the need to enter octal correctly which is particularly + difficult in yaml setup files. (smcv) + * graphviz: Support urls embedded in the graph, by having graphviz + generate an imagemap. + * graphviz: Support wikilinks embedded in the graph. + (Sponsored by The TOVA Company.)"""]] \ No newline at end of file diff -Nru ikiwiki-3.20111107ubuntu1/doc/plugins/contrib/pagespec_alias.mdwn ikiwiki-3.20111229ubuntu1/doc/plugins/contrib/pagespec_alias.mdwn --- ikiwiki-3.20111107ubuntu1/doc/plugins/contrib/pagespec_alias.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/plugins/contrib/pagespec_alias.mdwn 2011-12-29 14:31:25.000000000 +0000 @@ -0,0 +1,28 @@ +[[!template id=plugin name=pagespec_alias author="[[Jon]]"]] +[[!tag type/meta]] + +The pagespec_alias plugin allows the administrator(s) of a wiki to define +[[PageSpec]] aliases: short names for PageSpecs to ease re-use. + +Within the setup file, the `pagespec_aliases` value is treated as a list +of key/value pairs. The keys define alias names, the values the pagespecs +to which they refer. + +For example: + + pagespec_aliases: + image: "*.png or *.jpg or *.jpeg or *.gif or *.ico" + helper: "*.css or *.js" + boring: "image() or helper() or internal(*)" + +With the above, you could use the pagespec aliases such as + + \[[!map pages="!boring()"]] + +To define a site map which excluded various page names which might be +uninteresting to include in a site map. + + +## Download + + * diff -Nru ikiwiki-3.20111107ubuntu1/doc/plugins/contrib/pandoc.mdwn ikiwiki-3.20111229ubuntu1/doc/plugins/contrib/pandoc.mdwn --- ikiwiki-3.20111107ubuntu1/doc/plugins/contrib/pandoc.mdwn 2011-12-11 05:33:25.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/plugins/contrib/pandoc.mdwn 2012-01-09 06:37:39.000000000 +0000 @@ -2,5 +2,5 @@ This plugin enables Markdown processing using [Pandoc](http://johnmacfarlane.net/pandoc/). You can configure it for Pandoc to take over processing of all .mkdn files, or only files with a different extension. Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. -This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . +This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . diff -Nru ikiwiki-3.20111107ubuntu1/doc/plugins/theme.mdwn ikiwiki-3.20111229ubuntu1/doc/plugins/theme.mdwn --- ikiwiki-3.20111107ubuntu1/doc/plugins/theme.mdwn 2011-12-11 05:33:22.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/plugins/theme.mdwn 2012-01-09 06:37:37.000000000 +0000 @@ -9,3 +9,10 @@ You can set the theme via the **theme** option in your config file (after enabling the plugin). Refresh the wiki after changing it to see the changes. + +Hints for theme builders +------------------------ + + * Start from an existing [[CSS file|css]], see also the [[css market]] for examples + * You can override the [[templates]] files by dropping them in a `templates` subdirectory + * Try to stick with modifying the CSS however, maintaining custom templates is harder diff -Nru ikiwiki-3.20111107ubuntu1/doc/sandbox.mdwn ikiwiki-3.20111229ubuntu1/doc/sandbox.mdwn --- ikiwiki-3.20111107ubuntu1/doc/sandbox.mdwn 2011-12-11 05:33:21.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/sandbox.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -168,5 +168,6 @@ endmodule """]] +# This is simple enough for now [[sandbocen]] no? diff -Nru ikiwiki-3.20111107ubuntu1/doc/shortcuts/discussion.mdwn ikiwiki-3.20111229ubuntu1/doc/shortcuts/discussion.mdwn --- ikiwiki-3.20111107ubuntu1/doc/shortcuts/discussion.mdwn 2011-12-11 05:33:37.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/shortcuts/discussion.mdwn 2012-01-09 06:37:57.000000000 +0000 @@ -10,4 +10,12 @@ Thanks. --[[PaulePanter]] -> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they should be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by an edit by Paul Panter. +> Personally, I think they should be separate shortcut keys. Most of my +> google/WP usage is such that I would prefer it over HTTP (faster, less +> resource usage at client side). However, I never use the shortcuts feature +> in ikiwiki anyway... -- [[Jon]] + +>> I have been trying to decide what to do about that Jon. https links are +>> painful for me (dialup). This really needs to be fixed at a lower level +>> in the web than ikiwiki though, and I understand the push for https. --[[Joey]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/sitemap.mdwn ikiwiki-3.20111229ubuntu1/doc/sitemap.mdwn --- ikiwiki-3.20111107ubuntu1/doc/sitemap.mdwn 2011-12-11 05:33:22.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/sitemap.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -1,6 +1,5 @@ This map excludes discussion pages, as well as subpages that are in feeds. -[[!map pages="* and !*/discussion and !recentchanges +[[!map pages="page(*) and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* -and !sandbox/* and !forum/* and !todo/* and !users/* -and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] +and !sandbox/* and !forum/* and !todo/* and !users/*"]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/themes/discussion.mdwn ikiwiki-3.20111229ubuntu1/doc/themes/discussion.mdwn --- ikiwiki-3.20111107ubuntu1/doc/themes/discussion.mdwn 2011-12-11 05:33:37.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/themes/discussion.mdwn 2012-01-09 06:37:57.000000000 +0000 @@ -4,3 +4,4 @@ For an example of the theme in action, see: [[https://antportal.com/wiki/]] +> Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/tips/convert_mediawiki_to_ikiwiki.mdwn ikiwiki-3.20111229ubuntu1/doc/tips/convert_mediawiki_to_ikiwiki.mdwn --- ikiwiki-3.20111107ubuntu1/doc/tips/convert_mediawiki_to_ikiwiki.mdwn 2011-12-11 05:33:28.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/tips/convert_mediawiki_to_ikiwiki.mdwn 2012-01-09 06:37:48.000000000 +0000 @@ -1,6 +1,6 @@ [[!toc levels=2]] -Mediawiki is a dynamically-generated wiki which stores it's data in a +Mediawiki is a dynamically-generated wiki which stores its data in a relational database. Pages are marked up using a proprietary markup. It is possible to import the contents of a Mediawiki site into an ikiwiki, converting some of the Mediawiki conventions into Ikiwiki ones. diff -Nru ikiwiki-3.20111107ubuntu1/doc/tips/laptop_wiki_with_git/discussion.mdwn ikiwiki-3.20111229ubuntu1/doc/tips/laptop_wiki_with_git/discussion.mdwn --- ikiwiki-3.20111107ubuntu1/doc/tips/laptop_wiki_with_git/discussion.mdwn 2011-12-11 05:33:29.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/tips/laptop_wiki_with_git/discussion.mdwn 2012-01-09 06:37:49.000000000 +0000 @@ -10,3 +10,6 @@ > Of course you don't need a web server on the laptop. It is useful for > previewing pages before publishing them though. --[[Joey]] + +I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?) +[[Micheal]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/allow_site-wide_meta_definitions.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/allow_site-wide_meta_definitions.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/allow_site-wide_meta_definitions.mdwn 2011-12-11 05:33:56.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/allow_site-wide_meta_definitions.mdwn 2012-01-09 06:38:08.000000000 +0000 @@ -161,3 +161,9 @@ >>>>>>> No pity required — but whoops, yes, that was a bit of a mistake >>>>>>> ☺ I guess I'll have to split the current `preprocess` in half. >>>>>>> — [[Jon]] + +>>>>>>>> I've been taking another look at this today, as I'm very keen to +>>>>>>>> close various open loops of mine in IkiWiki to move on and do some +>>>>>>>> other stuff. However, I'm not actually *using* this at the moment, +>>>>>>>> so whilst I think it's a good idea, I can't really motivate myself +>>>>>>>> to fix it anymore. I guess for now, this should just rot. — [[Jon]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/configurable_tidy_command_for_htmltidy.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/configurable_tidy_command_for_htmltidy.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/configurable_tidy_command_for_htmltidy.mdwn 2011-12-11 05:33:56.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/configurable_tidy_command_for_htmltidy.mdwn 2012-01-09 06:38:08.000000000 +0000 @@ -3,6 +3,6 @@ I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line. This seemed like a generally useful thing, so I've published my [patch][] as a Git branch. [play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html -[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 +[patch]: http://git.tremily.us/?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 > Thanks, [[done]] --[[Joey]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/Improve_markdown_speed.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/Improve_markdown_speed.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/Improve_markdown_speed.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/Improve_markdown_speed.mdwn 2011-12-05 19:17:53.000000000 +0000 @@ -0,0 +1,6 @@ +I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). + +>> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Upskirt instead, which uses the Upskirt library which Sundown appears to be derived from. +>> -- [[KathrynAndersen]] + +[[wishlist]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/inline_raw_files.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/inline_raw_files.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/inline_raw_files.mdwn 2011-12-11 05:33:57.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/inline_raw_files.mdwn 2012-01-09 06:38:09.000000000 +0000 @@ -9,7 +9,7 @@ I'm using the new code in my [blog][]. -[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ +[blog]: http://blog.tremily.us/posts/yacc2dot/ usage ===== diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/mdwn_itex.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/mdwn_itex.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/mdwn_itex.mdwn 2011-12-11 05:33:58.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/mdwn_itex.mdwn 2012-01-09 06:38:11.000000000 +0000 @@ -19,4 +19,4 @@ [itex]: http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html [itex2MML]: http://golem.ph.utexas.edu/~distler/blog/itex2MML.html -[example]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/ +[example]: http://blog.tremily.us/posts/mdwn_itex/ diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/mdwn_preview/discussion.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/mdwn_preview/discussion.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/mdwn_preview/discussion.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/mdwn_preview/discussion.mdwn 2011-12-05 19:17:53.000000000 +0000 @@ -0,0 +1 @@ ++1, not sure where this feature is going. I'm keen to seen this! diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/natural_sorting.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/natural_sorting.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/natural_sorting.mdwn 2011-12-11 05:33:54.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/natural_sorting.mdwn 2012-01-09 06:38:06.000000000 +0000 @@ -7,7 +7,7 @@ provides an algorithm for that. there is a -[patch](http://git.ikiwiki.info/?p=ikiwiki;a=commit;h=55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed) +patch 55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed attached that makes the [[plugins/inline]] plugin use Sort::Naturally if sort is set to "title_natural". diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/org_mode.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/org_mode.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/org_mode.mdwn 2011-12-11 05:33:53.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/org_mode.mdwn 2012-01-09 06:38:06.000000000 +0000 @@ -18,7 +18,18 @@ inserted HTML depending on which plugins will be used during the [[htmlize phase|plugins/write#index11h3]]. +new plugin +========== + +A complete rewrite of the plugin can be found +[here][chrismgray-rewrite]. It is an [[external|plugins/write/external]] plugin using a +dedicated emacs instance to parse the org-mode files. Thus, it should +be a bit faster than the older plugin, as well as properly handling +[[wikilinks|ikiwiki/wikilink]] and images, two features not present in the older +plugin. + [org-mode]: http://orgmode.org/ [MS]: http://www.golden-gryphon.com/blog/manoj/blog/2008/06/08/Using_org-mode_with_Ikiwiki/ -[example]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Git/notes/ +[example]: http://blog.tremily.us/posts/Git/notes/ [raw]: http://orgmode.org/manual/Quoting-HTML-tags.html +[chrismgray-rewrite]: https://github.com/chrismgray/ikiwiki-org-plugin diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/pagespec_aliases.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/pagespec_aliases.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/pagespec_aliases.mdwn 2011-12-11 05:33:56.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/pagespec_aliases.mdwn 2012-01-09 06:38:09.000000000 +0000 @@ -100,6 +100,10 @@ >>>> for this patch. I personally like special pages like Kathryn is doing >>>> more than complex setup files. --[[Joey]] +>>>>> I've ran out of time to keep working on this, so I'm just going to +>>>>> submit it as a 'contrib' plugin and leave things at that for now. +>>>>> — [[Jon]] + --------------------------- Based on the above, I have written an experimental plugin called "subset". @@ -162,3 +166,4 @@ >>>>> I'm a bit confused by your statement "having the aliases/subsets/"things" work in any pagespec (inside map, or inline) is a deal-breaker for me". >>>>> Do you mean that you want them to work in any pagespec, or that you *don't* want them to work in any pagespec? -- [[KathrynAndersen]] +>>>>>> I mean I would want them to work in any pagespec. — [[Jon]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/Pagination_next_prev_links.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/Pagination_next_prev_links.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/Pagination_next_prev_links.mdwn 2011-12-11 05:33:55.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/Pagination_next_prev_links.mdwn 2012-01-09 06:38:08.000000000 +0000 @@ -4,12 +4,20 @@ -Thank you +[Jekyll](http://jekyllrb.com/)'s implementation looks rather neat: + +* +* + + > This is a perfect use for [[todo/wikitrails]], of which my > [[plugins/contrib/trail]] plugin is an implementation. Code review on that > plugin would be welcome; it might even get merged one day. > +>> The trail plugin is very likely to be merged soon, and is already +>> available. So, closing this bug report [[done]] --[[Joey]] +> > Unfortunately, IkiWiki blogs use a [[ikiwiki/PageSpec]] to define the set of > "posts" in the blog (through which the next/prev trail should range), and > the current implementation of [[plugins/contrib/trail]] in terms of typed @@ -53,3 +61,8 @@ >>> Making [[plugins/contrib/album]] require `trail` v3, and trying it out >>> on my blog, are next on the list. >>> --[[smcv]] + +>>>> Sorry thank link doesn't work. I get a forbidden. --[[hendry]] + + +[[wishlist]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/sorting_by_path.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/sorting_by_path.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/sorting_by_path.mdwn 2011-11-30 16:14:53.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/sorting_by_path.mdwn 2012-01-09 06:38:12.000000000 +0000 @@ -14,3 +14,5 @@ cherry-picked if you don't want the rest of `trail`. --[[smcv]] + +> [[done]] --[[Joey]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/submodule_support.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/submodule_support.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/submodule_support.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/submodule_support.mdwn 2011-12-24 23:43:15.000000000 +0000 @@ -0,0 +1,15 @@ +I would love to be able to publish my theme in my personnal wiki. The theme is in a separate git repository, and i feel it would be pretty awesome if it was rendered within my main ikiwiki site. I have tried the following: + + git submodule add /usr/share/ikiwiki/themes/night_city/ + git commit -m"add the theme to my site" ; git push + +But this made really weird things on the other side. The files from the theme end up flat in the parent directory. Now I have reverted the above change and ikiwiki *still* generates those files. Not sure what is going on. + +To be really clear here: this is an arbitrary source code repository that I want to include, I do not mean to enable the theme with this, this could very well be presentation material, C source code or whatever else... In fact, I think this would be a powerful way to do syntax highlightning for source code published on your website... + +Other people had experience with this? Or other suggestions on how to publish repositories within my site? -- [[anarcat]] + +> Ikiwiki does not support git submodules. +> +> You can use the [[ikiwiki/plugin/underlay]] plugin to merge the +> contents of other directories into your wiki's source. --[[Joey]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/test_coverage.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/test_coverage.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/test_coverage.mdwn 2011-11-30 16:14:53.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/test_coverage.mdwn 2012-01-09 06:38:12.000000000 +0000 @@ -11,8 +11,14 @@ the two copies of each module; not a problem for [[plugins/contrib/trail]] which only has one test. +> How annoying. I think in at least some cases there is reason to use +> `./blib` -- perhaps everything that users `.` should be changed to use +> it. --[[Joey]] + * The [[plugins/git]] and [[plugins/mercurial]] plugins want to `chdir`, and so does [[!cpan Devel::Cover]], so they fight. For now, those tests are disabled under `make coverage`. --[[smcv]] + +> [[merged|done]] --[[Joey]] diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/themes_should_ship_with_templates.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/themes_should_ship_with_templates.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/themes_should_ship_with_templates.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/themes_should_ship_with_templates.mdwn 2011-12-22 17:34:23.000000000 +0000 @@ -0,0 +1,19 @@ +if i understand [[todo/multiple_template_directories]] correctly, i read it as templates directories being separate from themes. shouldn't a themer be able to ship more than just a CSS and instead override the (say) page.tmpl page? -- [[anarcat]] + +> A theme can ship any files it wants to, including templates (in the +> templates/ directory). +> +> So far none of them do; I'd much rather have one version of page.tmpl to +> maintain than one per theme.. --[[Joey]] + +> > that, dear author, is amazingly simple, intuitive and useful. why didn't i try this before! :) thank you very much! +> > +> > i do agree that having a completely different template file is tricky, but I think it's important for themes to be able to modify those files, otherwise making themes is *really* hard. besides the burden of maintenance falls on the theme maintainer, and as long as it's not in ikiwiki core, you have nothing to worry about... right? ;) +> > +> > i have just ported the [night_city theme](http://www.openwebdesign.org/viewdesign.phtml?id=3318) to ikiwiki, and it was a nightmare when i wasn't modifying the page.tmpl... but now it's done! i'll try to publish my changes somewhere when i finish figuring out how to share small things like that easily. ;) ([[suggestions|submodule_support]]?) +> > +> > i guess the only thing to be done here is to update the documentation so that this is clearer - where do you suggest I do that? --[[anarcat]] +> > +> > > i have updated the [[plugins/theme]] documentation, hopefully that was the right place. so i think this is [[done]] --[[anarcat]] + +>>>> I would love it it you would share your theme! Thanks, Adam. :-) diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn 2011-12-14 21:01:21.000000000 +0000 @@ -0,0 +1,3 @@ +A [[wishlist]] item. + +It would be nice if the websetup plugin could link to plugin descriptions. When it refers to a plugin by name, the name could be a link to (or other suitable location). --liw diff -Nru ikiwiki-3.20111107ubuntu1/doc/todo/wikitrails.mdwn ikiwiki-3.20111229ubuntu1/doc/todo/wikitrails.mdwn --- ikiwiki-3.20111107ubuntu1/doc/todo/wikitrails.mdwn 2011-12-11 05:33:56.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/todo/wikitrails.mdwn 2012-01-09 06:38:09.000000000 +0000 @@ -5,6 +5,8 @@ ... is the out-of-tree [[plugins/contrib/trail]] plugin, see there for details. +> And will be the one landing in ikiwiki. So, I'm closing this bug report. [[done]] --[[Joey]] + ### chrysn's implementation i'm working on a python xmlrpc plugin for ikiwiki to support wikitrails, both as a navigation feature (have "forward" and "back" links based on a sequence) and a modified inline that includes all pages in the trail with appropriate modifications (suitable for printing if necessary). diff -Nru ikiwiki-3.20111107ubuntu1/doc/usage.mdwn ikiwiki-3.20111229ubuntu1/doc/usage.mdwn --- ikiwiki-3.20111107ubuntu1/doc/usage.mdwn 2011-12-11 05:33:22.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/usage.mdwn 2012-01-09 06:37:36.000000000 +0000 @@ -384,4 +384,4 @@ Joey Hess -Warning: this page is automatically made into ikiwiki's man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care +Warning: Automatically converted into a man page by mdwn2man. Edit with care diff -Nru ikiwiki-3.20111107ubuntu1/doc/users/Erkan_Yilmaz.mdwn ikiwiki-3.20111229ubuntu1/doc/users/Erkan_Yilmaz.mdwn --- ikiwiki-3.20111107ubuntu1/doc/users/Erkan_Yilmaz.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/users/Erkan_Yilmaz.mdwn 2011-12-27 16:33:21.000000000 +0000 @@ -0,0 +1,2 @@ +* [[recentchanges]] +* my site: [here](http://iaskquestions.com) diff -Nru ikiwiki-3.20111107ubuntu1/doc/users/wtk.mdwn ikiwiki-3.20111229ubuntu1/doc/users/wtk.mdwn --- ikiwiki-3.20111107ubuntu1/doc/users/wtk.mdwn 2011-12-11 05:34:02.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/doc/users/wtk.mdwn 2012-01-09 06:38:15.000000000 +0000 @@ -3,4 +3,4 @@ * Git branch: `wtk`. * [Ikiwiki-based blog][blog] -[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/ +[blog]: http://blog.tremily.us/ diff -Nru ikiwiki-3.20111107ubuntu1/IkiWiki/Plugin/sortnaturally.pm ikiwiki-3.20111229ubuntu1/IkiWiki/Plugin/sortnaturally.pm --- ikiwiki-3.20111107ubuntu1/IkiWiki/Plugin/sortnaturally.pm 2011-12-11 05:34:10.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/IkiWiki/Plugin/sortnaturally.pm 2012-01-09 06:38:23.000000000 +0000 @@ -30,4 +30,9 @@ IkiWiki::pagetitle(IkiWiki::basename($b))) } +sub cmp_path_natural { + Sort::Naturally::ncmp(IkiWiki::pagetitle($a), + IkiWiki::pagetitle($b)) +} + 1; diff -Nru ikiwiki-3.20111107ubuntu1/IkiWiki/Plugin/tag.pm ikiwiki-3.20111229ubuntu1/IkiWiki/Plugin/tag.pm --- ikiwiki-3.20111107ubuntu1/IkiWiki/Plugin/tag.pm 2011-12-11 05:34:10.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/IkiWiki/Plugin/tag.pm 2012-01-09 06:38:23.000000000 +0000 @@ -201,7 +201,7 @@ if (defined $tags && %$tags) { eval q{use HTML::Entities}; $template->param(categories => - [map { category => HTML::Entities::encode_entities(tagname($_)) }, + [map { category => HTML::Entities::encode_entities_numeric(tagname($_)) }, sort keys %$tags]); } } diff -Nru ikiwiki-3.20111107ubuntu1/IkiWiki/Receive.pm ikiwiki-3.20111229ubuntu1/IkiWiki/Receive.pm --- ikiwiki-3.20111107ubuntu1/IkiWiki/Receive.pm 2011-12-11 05:34:10.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/IkiWiki/Receive.pm 2012-01-09 06:38:22.000000000 +0000 @@ -35,10 +35,17 @@ } "u != $uid"; } @{$config{untrusted_committers}}). - ") exit(0);\n"; + ") {\n"; $ret.=<<"EOF"; + /* Trusted user. + * Consume all stdin before exiting, as git may + * otherwise be unhappy. */ + char buf[256]; + while (read(0, &buf, 256) != 0) {} + exit(0); + } asprintf(&s, "CALLER_UID=%i", u); newenviron[i++]=s; } diff -Nru ikiwiki-3.20111107ubuntu1/ikiwiki-makerepo ikiwiki-3.20111229ubuntu1/ikiwiki-makerepo --- ikiwiki-3.20111107ubuntu1/ikiwiki-makerepo 2011-12-11 05:33:20.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/ikiwiki-makerepo 2012-01-09 06:37:35.000000000 +0000 @@ -86,7 +86,6 @@ cd "$srcdir" git init echo /.ikiwiki > .gitignore - echo /recentchanges >> .gitignore git add . git commit -m "initial commit" git remote add origin "$repository" diff -Nru ikiwiki-3.20111107ubuntu1/IkiWiki.pm ikiwiki-3.20111229ubuntu1/IkiWiki.pm --- ikiwiki-3.20111107ubuntu1/IkiWiki.pm 2011-12-11 05:33:20.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/IkiWiki.pm 2012-01-09 06:37:35.000000000 +0000 @@ -2808,6 +2808,7 @@ IkiWiki::pagetitle(IkiWiki::basename($b)) } +sub cmp_path { IkiWiki::pagetitle($a) cmp IkiWiki::pagetitle($b) } sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} } sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} } diff -Nru ikiwiki-3.20111107ubuntu1/Makefile.PL ikiwiki-3.20111229ubuntu1/Makefile.PL --- ikiwiki-3.20111107ubuntu1/Makefile.PL 2011-12-11 05:33:20.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/Makefile.PL 2012-01-09 06:37:35.000000000 +0000 @@ -154,6 +154,13 @@ -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki + +# The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests +# to stop them hurting each other. +coverage: + cover -delete + $(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))" + cover } } diff -Nru ikiwiki-3.20111107ubuntu1/t/cmp_path.t ikiwiki-3.20111229ubuntu1/t/cmp_path.t --- ikiwiki-3.20111107ubuntu1/t/cmp_path.t 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/t/cmp_path.t 2011-12-06 18:26:34.000000000 +0000 @@ -0,0 +1,48 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 25; + +BEGIN { use_ok("IkiWiki"); } + +%config=IkiWiki::defaultconfig(); +$config{srcdir}=$config{destdir}="/dev/null"; +IkiWiki::checkconfig(); + +sub test { + my ($before, $after) = @_; + + $IkiWiki::SortSpec::a = $before; + $IkiWiki::SortSpec::b = $after; + my $r = IkiWiki::SortSpec::cmp_path(); + + if ($before eq $after) { + is($r, 0); + } + else { + is($r, -1); + } + + $IkiWiki::SortSpec::a = $after; + $IkiWiki::SortSpec::b = $before; + $r = IkiWiki::SortSpec::cmp_path(); + + if ($before eq $after) { + is($r, 0); + } + else { + is($r, 1); + } + + is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $before, $after)], + [$before, $after]); + is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $after, $before)], + [$before, $after]); +} + +test("a/b/c", "a/b/c"); +test("a/b", "a/c"); +test("a/z", "z/a"); +test("a", "a/b"); +test("a", "a/b"); +test("a/z", "ab"); diff -Nru ikiwiki-3.20111107ubuntu1/t/pagespec_match_list.t ikiwiki-3.20111229ubuntu1/t/pagespec_match_list.t --- ikiwiki-3.20111107ubuntu1/t/pagespec_match_list.t 2011-12-11 05:34:09.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/t/pagespec_match_list.t 2012-01-09 06:38:20.000000000 +0000 @@ -12,7 +12,7 @@ { package IkiWiki::SortSpec; - sub cmp_path { $a cmp $b } + sub cmp_raw_path { $a cmp $b } } %pagesources=( @@ -53,7 +53,7 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", filter => sub { $_[0] =~ /3/}) ], ["post/1", "post/2"]); -is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)], +is_deeply([pagespec_match_list("foo", "*", sort => "raw_path", num => 2)], ["bar", "foo"]); is_deeply([pagespec_match_list("foo", "foo* or bar*", sort => "-age title")], # oldest first, break ties by title diff -Nru ikiwiki-3.20111107ubuntu1/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn ikiwiki-3.20111229ubuntu1/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn --- ikiwiki-3.20111107ubuntu1/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn 2011-12-11 05:33:39.000000000 +0000 +++ ikiwiki-3.20111229ubuntu1/underlays/basewiki/ikiwiki/pagespec/sorting.mdwn 2012-01-09 06:37:59.000000000 +0000 @@ -7,10 +7,14 @@ * `mtime` - List pages with the most recently modified first. -* `title` - Order by title (page name). +* `title` - Order by title (page name), e.g. "z/a a/b a/c" + +* `path` - Order by page name including parents, e.g. "a/b a/c z/a" [[!if test="enabled(sortnaturally)" then=""" * `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +* `path_natural` - Like `path`, but numbers in the title are treated as such """]] [[!if test="enabled(meta)" then=""" * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`