diff options
45 files changed, 607 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore index fe1c3d441..f8991a63d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out pm_to_blib +/MYMETA.yml *.man /po/cover_db po/po2wiki_stamp diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 83bd670cb..89da5c453 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -113,8 +113,7 @@ sub launchaggregation () { my @feeds=needsaggregate(); return unless @feeds; if (! lockaggregate()) { - debug("an aggregation process is already running"); - return; + error("an aggregation process is already running"); } # force a later rebuild of source pages $IkiWiki::forcerebuild{$_->{sourcepage}}=1 diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 0c0e27521..3879abeae 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -341,8 +341,8 @@ sub parse_diff_tree ($) { my $dt_ref = shift; # End of stream? - return if !defined @{ $dt_ref } || - !defined @{ $dt_ref }[0] || !length @{ $dt_ref }[0]; + return if ! @{ $dt_ref } || + !defined $dt_ref->[0] || !length $dt_ref->[0]; my %ci; # Header line. diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index a58a27d52..36c012c73 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -29,6 +29,7 @@ sub import { "irc", "ircs", "lastfm", "ldaps", "magnet", "mms", "msnim", "notes", "rsync", "secondlife", "skype", "ssh", "sftp", "smb", "sms", "snews", "webcal", "ymsgr", + "bitcoin", "git", "svn", "bzr", "darcs", "hg" ); # data is a special case. Allow a few data:image/ types, # but disallow data:text/javascript and everything else. diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 2805f60ef..808d3cd2b 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -25,7 +25,7 @@ sub canedit ($$) { my $cgi=shift; my $session=shift; - return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; + return "" if $config{discussion} && $page=~/(\/|^)\Q$config{discussionpage}\E$/i; return "" if pagespec_match($page, "postcomment(*)"); return undef; } diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index b6642619a..40a956849 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -100,9 +100,10 @@ sub formbuilder_setup (@) { IkiWiki::openiduser($session->param("name"))) { $form->field(name => "openid_identifier", disabled => 1, label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), - value => $session->param("name"), - size => length($session->param("name")), force => 1, - fieldset => "login"); + value => "", + size => 1, force => 1, + fieldset => "login", + comment => $session->param("name")); $form->field(name => "email", type => "hidden"); } } diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 2773486a6..32756a571 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -23,11 +23,13 @@ sub getsetup () { my %pagenum; sub preprocess (@) { - my %params=(open => "yes", total => "yes", percent => "yes", @_); + my %params=(open => "yes", total => "yes", percent => "yes", + expandable => "no", @_); my $open=IkiWiki::yesno($params{open}); my $showtotal=IkiWiki::yesno($params{total}); my $showpercent=IkiWiki::yesno($params{percent}); + my $expandable=IkiWiki::yesno($params{expandable}); $pagenum{$params{page}}++; my %choices; @@ -74,6 +76,19 @@ sub preprocess (@) { $ret.="</form>\n"; } } + + if ($expandable && $open && exists $config{cgiurl}) { + $ret.="<p>\n"; + $ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n"; + $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n"; + $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n"; + $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n"; + $ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n"; + $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n"; + $ret.="</form>\n"; + $ret.="</p>\n"; + } + if ($showtotal) { $ret.="<span>".gettext("Total votes:")." $total</span>\n"; } @@ -85,7 +100,7 @@ sub sessioncgi ($$) { my $session=shift; if (defined $cgi->param('do') && $cgi->param('do') eq "poll") { my $choice=decode_utf8($cgi->param('choice')); - if (! defined $choice) { + if (! defined $choice || not length $choice) { error("no choice specified"); } my $num=$cgi->param('num'); @@ -118,7 +133,14 @@ sub sessioncgi ($$) { my $params=shift; return "\\[[$prefix $params]]" if $escape; if (--$num == 0) { - $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se; + if ($params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se) { + } + elsif ($params=~/expandable=(\w+)/ + & &IkiWiki::yesno($1)) { + $choice=~s/["\]\n\r]//g; + $params.=" 1 \"$choice\"" + if length $choice; + } if (defined $oldchoice) { $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se; } diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm index 7d2338f9b..d5fb2b5d6 100644 --- a/IkiWiki/Plugin/trail.pm +++ b/IkiWiki/Plugin/trail.pm @@ -62,12 +62,20 @@ sub getsetup () { }, } +# Cache of pages' old titles, so we can tell whether they changed +my %old_trail_titles; + sub needsbuild (@) { my $needsbuild=shift; + foreach my $page (keys %pagestate) { if (exists $pagestate{$page}{trail}) { if (exists $pagesources{$page} && grep { $_ eq $pagesources{$page} } @$needsbuild) { + # Remember its title, so we can know whether + # it changed. + $old_trail_titles{$page} = title_of($page); + # Remove state, it will be re-added # if the preprocessor directive is still # there during the rebuild. {item} is the @@ -78,6 +86,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } @@ -230,6 +239,12 @@ sub trails_differ { if (! exists $new->{$trail}) { return 1; } + + if (exists $old_trail_titles{$trail} && + title_of($trail) ne $old_trail_titles{$trail}) { + return 1; + } + my ($old_p, $old_n) = @{$old->{$trail}}; my ($new_p, $new_n) = @{$new->{$trail}}; $old_p = "" unless defined $old_p; @@ -239,9 +254,20 @@ sub trails_differ { if ($old_p ne $new_p) { return 1; } + + if (exists $old_trail_titles{$old_p} && + title_of($old_p) ne $old_trail_titles{$old_p}) { + return 1; + } + if ($old_n ne $new_n) { return 1; } + + if (exists $old_trail_titles{$old_n} && + title_of($old_n) ne $old_trail_titles{$old_n}) { + return 1; + } } foreach my $trail (keys %$new) { @@ -318,8 +344,6 @@ sub prerender { $prev = $members->[$i - 1] if $i > 0; my $next = $members->[$i + 1]; - add_depends($member, $trail); - $member_to_trails{$member}{$trail} = [$prev, $next]; } @@ -359,6 +383,12 @@ sub prerender { sub build_affected { my %affected; + # In principle we might not have done this yet, although in practice + # at least the trail itself has probably changed, and its template + # almost certainly contains TRAILS or TRAILLOOP, triggering our + # prerender as a side-effect. + prerender(); + foreach my $member (keys %rebuild_trail_members) { $affected{$member} = sprintf(gettext("building %s, its previous or next page has changed"), $member); } @@ -381,6 +411,8 @@ sub pagetemplate (@) { my $page = $params{page}; my $template = $params{template}; + return unless length $page; + if ($template->query(name => 'trails') && ! $recursive) { prerender(); @@ -406,13 +438,11 @@ sub pagetemplate (@) { my ($prevurl, $nexturl, $prevtitle, $nexttitle); if (defined $prev) { - add_depends($params{destpage}, $prev); $prevurl = urlto($prev, $page); $prevtitle = title_of($prev); } if (defined $next) { - add_depends($params{destpage}, $next); $nexturl = urlto($next, $page); $nexttitle = title_of($next); } diff --git a/debian/changelog b/debian/changelog index 3e6075631..d1d132e1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,28 @@ -ikiwiki (3.20121018) UNRELEASED; urgency=low +ikiwiki (3.20121213) UNRELEASED; urgency=low + + * htmlscrubber: Allow the bitcoin URI scheme. + * htmlscrubber: Allow the URI schemes of major VCS's. + * aggregate: When run with --aggregate, if an aggregation is already + running, don't go on and --refresh. + * trail: Avoid excess dependencies between pages in the trail + and the page defining the trail. Thanks, smcv. + * opendiscussion: Don't allow editing discussion pages if discussion pages + are disabled. (smcv) + * poll: Add expandable option to allow users to easily add new choices to + a poll. + * trail: Avoid massive slowdown caused by pagetemplate hook when displaying + dynamic cgi pages, which cannot use trail anyway. + + -- Joey Hess <joeyh@debian.org> Sat, 22 Dec 2012 16:15:24 -0400 + +ikiwiki (3.20121212) unstable; urgency=low * filecheck: Fix bug that prevented File::MimeInfo::Magic from ever being used. + * openid: Display openid in Preferences page as a comment, so it can be + selected in all browsers. - -- Joey Hess <joeyh@debian.org> Sun, 04 Nov 2012 11:59:10 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 11 Dec 2012 12:12:12 -0400 ikiwiki (3.20121017) unstable; urgency=low diff --git a/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn b/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn new file mode 100644 index 000000000..a43bd408f --- /dev/null +++ b/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn @@ -0,0 +1,15 @@ +[[!tag bugs wishlist]] + + +I accidentally made a typo spelling "surprises" and changed my URL from + +<http://natalian.org/archives/2012/12/04/Singapore_banking_suprises/> +to +<http://natalian.org/archives/2012/12/04/Singapore_banking_suprises/> + +Using the meta redir. However the meta redir now appears in the index of <http://natalian.org/> + +Any ideas how to handle this situation? + +> Well, you can adjust the inline's pagespec to exclude it, or even tag it +> with a tag that the pagespec is adjusted to exclude. --[[Joey]] diff --git a/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn b/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn index e4bc736e3..cacd2b73b 100644 --- a/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn +++ b/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn @@ -1,6 +1,11 @@ +[[!template id=gitbranch branch=smcv/ready/less-open author="[[smcv]]"]] +[[!tag patch]] + The [[plugins/opendiscussion]] plugin allows pages named according to the `discussionpage` setting to be edited anonymously, even if `discussion => 0` is set. (If it respected the `discussion` option, the combination of `opendiscussion` and `moderatedcomments` might be good for blogs.) + +[[done]] --[[smcv]] diff --git a/doc/bugs/toc_displays_headings_from_sidebar.mdwn b/doc/bugs/toc_displays_headings_from_sidebar.mdwn new file mode 100644 index 000000000..469ca8a33 --- /dev/null +++ b/doc/bugs/toc_displays_headings_from_sidebar.mdwn @@ -0,0 +1,3 @@ +The [[/ikiwiki/directive/toc]] directive scrapes all headings from the page, including those in the sidebar. So, if the sidebar includes navigational headers, every page with a table of contents will display those navigational headers before the headers in that page's content. + +I'd like some way to exclude the sidebar from the table of contents. As discussed via Jabber, perhaps toc could have a config option to ignore headers inside a nav tag or a tag with id="sidebar". diff --git a/doc/bugs/trail_excess_dependencies.mdwn b/doc/bugs/trail_excess_dependencies.mdwn new file mode 100644 index 000000000..f806a62eb --- /dev/null +++ b/doc/bugs/trail_excess_dependencies.mdwn @@ -0,0 +1,95 @@ +I've just modified the trail plugin to use only presence, and not +content dependencies. Using content dependencies, particularly to the page +that defines the trail, meant that every time that page changed, *every* +page in the trail gets rebuilt. This leads to users setting up sites that +have horrible performance, if the trail is defined in, for example, the top +page of a blog. + +Unfortunatly, this change to presence dependencies has +introduced a bug. Now when an existing trail is removed, the pages in the +trail don't get rebuilt to remove the trail (both html display and state). + +> Actually, this particular case is usually OK. Suppose a trail `untrail` +> contains `untrail/a` (as is the case in the regression +> test I'm writing), and you build the wiki, then edit `untrail` to no +> longer be a trail, and refresh. `untrail` has changed, so it is +> rendered. Assuming that the template of either `untrail` or another +> changed page happens to contain the `TRAILS` variable (which is not +> guaranteed, but is highly likely), `I::P::t::prerender` +> is invoked. It notices that `untrail/a` was previously a trail +> member and is no longer, and rebuilds it with the diagnostic +> "building untrail/a, its previous or next page has changed". +> +> Strictly speaking, I should change `I::P::t::build_affected` +> so it calls `prerender`, so we're guaranteed to have done the +> recalculation. Fixed in my branch. --[[smcv]] + +I think that to fix this bug, the plugin should use a hook to +force rebuilding of all the pages that were in the trail, when +the trail is removed (or changed). + +> The case of "the trail is changed" is still broken: +> if the order of items changes, or the trail is removed, +> then the logic above means it's OK, but if you +> change the `\[[!meta title]]` of the trail, or anything else +> used in the prev/up/next bar, the items won't show that +> change. Fixed in my branch. --[[smcv]] + +There's a difficulty in doing that: The needsbuild hook runs before the scan +hook, so before it has a chance to see if the trail directive is still there. +It'd need some changes to ikiwiki's hooks. + +> That's what `build_affected` is for, and trail already used it. --s + +(An improvement in this area would probably simplify other plugins, which +currently abuse the needsbuild hook to unset state, to handle the case +where the directive that resulted in that state is removed.) + +I apologise for introducing a known bug, but the dependency mess was too +bad to leave as-is. And I have very little time (and regrettably, even less +power) to deal with it right now. :( --[[Joey]] + +[[!template id=gitbranch branch=smcv/ready/trail author="[[Simon_McVittie|smcv]]"]] +[[!tag patch]] + +> I believe my `ready/trail` branch fixes this. There are regression tests. +> +> Here is an analysis of how the trail pages interdepend. +> +> * If *trail* contains a page *member* which does exist, *member* depends +> on *trail*. This is so that if the trail directive is deleted from +> *trail*, or if *trail*'s "friendly" title or trail settings are changed, +> the trail navigation bar in *member* will pick up that change. This is +> now only a presence dependency, which isn't enough to make those happen +> correctly. [Edited to add: actually, the title is the only thing that +> can affect *member* without affecting the order of members.] +> +> * If *trail* contains consecutive pages *m1* and *m2* in that order, +> *m1* and *m2* depend on each other. This is so that if one's +> "friendly" title changes, the other is rebuilt. This is now only +> a presence dependency, which isn't enough to make those happen +> correctly. In my branch, I explicitly track the "friendly" title +> for every page that's edited and is involved in a trail somehow. +> +> * If *trail* has *member* in its `pagenames` but there is no page called +> *member*, then *trail* must be rebuilt if *member* is created. This +> was always a presence dependency, and is fine. +> +> In addition, the `trail` plugin remembers the maps +> { trail => next item in that trail } and { trail => previous item in +> that trail } for each page. If either changes, the page gets rebuilt +> by `build_affected`, with almost the same logic as is used to update +> pages that link to a changed page. My branch extends this to track the +> "friendly title" of each page involved in a trail, either by being +> the trail itself or a member (or both). +> +> I think it's true to say that the trail always depends on every member, +> even if it doesn't display them. This might mean that we can use +> "render the trail page" as an opportunity to work out whether any of +> its members are also going to need re-rendering? +> [Edited to add: actually, I didn't need this to be true, but I made the +> regression test check it anyway.] +> +> --[[smcv]] + +>>> Thanks **very** much! [[done]] --[[Joey]] diff --git a/doc/bugs/yaml:xs_codependency_not_listed.mdwn b/doc/bugs/yaml:xs_codependency_not_listed.mdwn new file mode 100644 index 000000000..f136d8b12 --- /dev/null +++ b/doc/bugs/yaml:xs_codependency_not_listed.mdwn @@ -0,0 +1,13 @@ +YAML:XS is not listed as a dep in the spec file which results in + +``` +HOME=/home/me /usr/bin/perl -Iblib/lib ikiwiki.in -dumpsetup ikiwiki.setup +Can't locate YAML/XS.pm in @INC (@INC contains: . blib/lib /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at (eval 39) line 2. +BEGIN failed--compilation aborted at (eval 39) line 2. +make: *** [ikiwiki.setup] Error 2 +error: Bad exit status from /var/tmp/rpm-tmp.Sgq2QK (%build) +``` + +when trying to build + +> Ok, added. [[done]] --[[Joey]] diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name.mdwn b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name.mdwn new file mode 100644 index 000000000..ad52c0091 --- /dev/null +++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name.mdwn @@ -0,0 +1,11 @@ +I tried to upload a file to my wiki last week, and got this error: + + Error: CGI::tmpFileName failed to return the uploaded file name + +This used to work, and I honestly don't know what could have changed to screw it up. + +I see that there's a lot of frustrated comments around this particular block of code in `attachment.pm`; so, for the record, I'm on Debian 6, using perl `5.10.1-17squeeze4`. + +Any thoughts? + +~jonathon diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_1_66c321b9eb618d20872cee7d6ca9e44c._comment b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_1_66c321b9eb618d20872cee7d6ca9e44c._comment new file mode 100644 index 000000000..fb499004e --- /dev/null +++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_1_66c321b9eb618d20872cee7d6ca9e44c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlRjjrKEyPmXnh2qBEGx9PgH5DP32wCMAQ" + nickname="Jonathon" + subject="ikiwiki version" + date="2013-01-02T14:59:19Z" + content=""" +I should also identify that I'm using ikiwiki `3.20100815.9`. +"""]] diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment new file mode 100644 index 000000000..e7659413e --- /dev/null +++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlRjjrKEyPmXnh2qBEGx9PgH5DP32wCMAQ" + nickname="Jonathon" + subject="figured it out" + date="2013-01-19T15:59:09Z" + content=""" +It looks like this was just another expression of [the header size limit issue] [1] that has already been reported and addressed. + +I got `3.20120629` from `squeeze-backports`, and my issue has been resolved. + +[1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638009 +"""]] diff --git a/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn b/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn new file mode 100644 index 000000000..34bc4ace2 --- /dev/null +++ b/doc/forum/How_to_set_up_git_repository_hook___63__.mdwn @@ -0,0 +1,19 @@ +Hi, + +I want to set up hooks for Git, and I don't know how to. Is there any documentation somewhere? Basically, I'd like to do what [[/ikiwiki-makerepo]] does, but manually. + +Why? Because I want to have a special layout to my repository. Especially, I want to include at the root level some special files: + +- the nginx configuration +- the script that installs the nginx configuration to the system +- the script that starts the fast-cgi wrapper +- the `ikiwiki.setup` file +- ... + +And I want the ikiwiki sources to be in a subdirectory `src/` and the generated files in `out/` (where the nginx configuration points). + +So, what is the special `post-update` hook generated by [[/ikiwiki-makerepo]]? I noticed it was an ELF file, why not a script? What does it do? + +Thanks, + +Mildred diff --git a/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment b/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment new file mode 100644 index 000000000..4ab5b52ee --- /dev/null +++ b/doc/forum/ikiwiki_and_big_files/comment_1_df8a9f4249af435cc335f77768a3278d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://mildred.fr/" + ip="2a01:e35:2f7b:8350:8d29:c70d:c3e:d110" + subject="git-annex" + date="2012-12-18T14:12:31Z" + content=""" +I suppose we could use git-annex to do that. The question is: does the Git plugin in ikiwiki supports git-annex ? I'd hope so. +"""]] diff --git a/doc/forum/ikiwiki_and_big_files/comment_2_2d996f1124aedc10f345139c3d8b11df._comment b/doc/forum/ikiwiki_and_big_files/comment_2_2d996f1124aedc10f345139c3d8b11df._comment new file mode 100644 index 000000000..6a11d9ae2 --- /dev/null +++ b/doc/forum/ikiwiki_and_big_files/comment_2_2d996f1124aedc10f345139c3d8b11df._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2012-12-21T11:02:19Z" + content=""" +Unfortunately, ikiwiki [[doesn't follow symlinks for security +reasons|security]] - if it did, anyone who can commit to the wiki +repository could publish any file readable by the user who runs ikiwiki, +including secrets like `~/.gnupg/secring.gpg` or +`~/.ssh/identity`. + +git-annex relies on symlinks, so that restriction breaks it. +It would be great to be able to use some restricted, safe subset +of symlinks (\"relative symlinks that point into `.git/annex`\" would +be enough to support git-annex), and I've looked into it in the past. +My [[plugins/contrib/album]] plugin would benefit from being able +to annex the actual photos, for instance. +"""]] diff --git a/doc/forum/ikiwiki_and_big_files/comment_3_dfbd38e2b457ea3c4f70266dbf8fbeab._comment b/doc/forum/ikiwiki_and_big_files/comment_3_dfbd38e2b457ea3c4f70266dbf8fbeab._comment new file mode 100644 index 000000000..6aae6dbd7 --- /dev/null +++ b/doc/forum/ikiwiki_and_big_files/comment_3_dfbd38e2b457ea3c4f70266dbf8fbeab._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="2001:4978:f:21a::2" + subject="comment 3" + date="2012-12-21T14:49:13Z" + content=""" +git-annex is gaining a new \"direct\" mode where it does not use symlinks. It remains to be seen if enough git operations will be supported in that mode to make it attractive to use. +"""]] diff --git a/doc/forum/po_plugin_doesn__39__t_create_po_files___40__only_pot__41__..mdwn b/doc/forum/po_plugin_doesn__39__t_create_po_files___40__only_pot__41__..mdwn new file mode 100644 index 000000000..95cb62d29 --- /dev/null +++ b/doc/forum/po_plugin_doesn__39__t_create_po_files___40__only_pot__41__..mdwn @@ -0,0 +1,11 @@ +On [[the po plugin's page|plugins/po]] it is clearly stated that "when the plugin has just been enabled, or when a page has just been declared as being translatable, the needed POT and PO files are created". Yet on all my attempts, only the pot file was created. Do I have to create the po files manually somehow? + +To be precise, these are the settings I put in my wiki's setup file to enable the po plugin: + + add_plugins => [qw{... po ...}], + po_master_language => 'de|Deutsch', + po_slave_languages => 'en|English', + po_translatable_pages => "mytranslatedpage", + po_link_to => 'current', + +… followed by "ikiwiki --setup mysetupfile". diff --git a/doc/ikiwiki/directive/poll.mdwn b/doc/ikiwiki/directive/poll.mdwn index 6aa3d2cea..0b47a2167 100644 --- a/doc/ikiwiki/directive/poll.mdwn +++ b/doc/ikiwiki/directive/poll.mdwn @@ -19,6 +19,8 @@ Parameters: * `open` - Whether voting is still open. Set to "no" to close the poll to voting. +* `expandable` - Set to "yes" to make this poll have an interface to add + another choice to the poll. * `total` - Show total number of votes at bottom of poll. Default is "yes". * `percent` - Whether to display percents. Default is "yes". diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index b56a7b9f2..bb94242bb 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -83,6 +83,10 @@ Projects & Organizations * [Telecomix Broadcast System](http://broadcast.telecomix.org/) * [WikiMIX.cc](http://WikiMIX.cc/) * Paris Observatory [Information System website](http://dio.obspm.fr/), also used for internal documentation +* [SolderPad Documentation](http://docs.solderpad.com) +* [The Open TV White Space Project](http://opentvws.org) +* [The RS-232 Club](http://rs232club.org) +* [FusionInventory project](http://www.fusioninventory.org) Personal sites and blogs ======================== @@ -160,7 +164,7 @@ Personal sites and blogs * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... -* [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/) +* [pmate](http://www.gnurant.org)'s homepage and [blog](http://www.gnurant.org/blog/) * [tychoish.com](http://tychoish.com/) - a blog/wiki mashup. blog posts are "rhizomes." * [Martin Burmester](http://www.martin-burmester.de/) * [Øyvind A. Holm (sunny256)](http://www.sunbase.org) — Read my Ikiwiki praise [here](http://www.sunbase.org/blog/why_ikiwiki/). @@ -173,7 +177,6 @@ Personal sites and blogs * [Michael Hammer](http://www.michael-hammer.at/) * [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git. * [The personal website of Andrew Back](http://carrierdetect.com) -* [SolderPad Documentation](http://docs.solderpad.com) * [Paul Elms](http://paul.elms.pro) Personal site and blog in russian. * [James' Tech Notes](http://jamestechnotes.com) My technical notes, blog, wiki, personal site. * [Salient Dream](http://www.salientdream.com/) - All Things Strange. diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c5af6cd30..b13e82146 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 69 "Accept only OpenID for logins" 21 "Accept only password logins" 43 "Accept both"]] +[[!poll 69 "Accept only OpenID for logins" 21 "Accept only password logins" 44 "Accept both"]] diff --git a/doc/news/version_3.20120516.mdwn b/doc/news/version_3.20120516.mdwn deleted file mode 100644 index aa85f54ef..000000000 --- a/doc/news/version_3.20120516.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -ikiwiki 3.20120516 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * meta: Security fix; add missing sanitization of author and authorurl. - Thanks, Raúl Benencia"""]]
\ No newline at end of file diff --git a/doc/news/version_3.20121212.mdwn b/doc/news/version_3.20121212.mdwn new file mode 100644 index 000000000..473b63190 --- /dev/null +++ b/doc/news/version_3.20121212.mdwn @@ -0,0 +1,6 @@ +ikiwiki 3.20121212 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * filecheck: Fix bug that prevented File::MimeInfo::Magic from ever + being used. + * openid: Display openid in Preferences page as a comment, so it can be + selected in all browsers."""]]
\ No newline at end of file diff --git a/doc/plugins/contrib/asymptote.mdwn b/doc/plugins/contrib/asymptote.mdwn index 31bf0b1fe..a85c60efc 100644 --- a/doc/plugins/contrib/asymptote.mdwn +++ b/doc/plugins/contrib/asymptote.mdwn @@ -1,4 +1,4 @@ -[[!template id=plugin name=asymptote author="[[PeterSimons]]"]] +[[!template id=plugin name=asymptote author="[Peter Simons](http://cryp.to/)"]] [[!tag type/widget]] This plugin provides the [[ikiwiki/directive/asymptote]] diff --git a/doc/plugins/google.mdwn b/doc/plugins/google.mdwn index 349c278ee..5346b8f40 100644 --- a/doc/plugins/google.mdwn +++ b/doc/plugins/google.mdwn @@ -1,4 +1,4 @@ -[[!template id=plugin name=google author="Peter Simons"]] +[[!template id=plugin name=google author="[Peter Simons](http://cryp.to/)"]] [[!tag type/web]] This plugin adds a search form to the wiki, using google's site search. diff --git a/doc/plugins/notifyemail/discussion.mdwn b/doc/plugins/notifyemail/discussion.mdwn new file mode 100644 index 000000000..631c680fc --- /dev/null +++ b/doc/plugins/notifyemail/discussion.mdwn @@ -0,0 +1,5 @@ +When I try to add this plugin to the setup file and run "ikiwiki --setup" I get an error: Can't locate IkiWiki/Plugin/notifyemail.pm + +All the other plugins I have installed have worked, so my setup should be ok - just this one is missing!?! + +> It's new in version 3.20120419, perhaps you have an older version? --[[smcv]] diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn index e95739cf3..f116649c1 100644 --- a/doc/plugins/search.mdwn +++ b/doc/plugins/search.mdwn @@ -5,7 +5,7 @@ This plugin adds full text search to ikiwiki, using the [xapian](http://xapian.org/) engine, its [omega](http://xapian.org/docs/omega/overview.html) frontend, and the [[!cpan Search::Xapian]], [[!cpan Digest::SHA]], and [[!cpan HTML::Scrubber]] -perl modules. +perl modules (on debian, check that you have packages `libsearch-xapian-perl`, `libdigest-sha-perl` and `libhtml-scrubber-perl` installed). The [[ikiwiki/searching]] page describes how to write search queries. diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index d74784ac2..5261df111 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -8,7 +8,7 @@ inside `/usr/share/ikiwiki/themes/`. See [[themes]] for an overview of the themes included in ikiwiki and the [[theme market]] for third party themes. 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. +enabling the plugin). Refresh the wiki (with `ikiwiki -setup <file>`, `--setup` won't work, they are not interchangable) after changing it to see the changes. Hints for theme builders ------------------------ diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn index a20a32489..387c90b75 100644 --- a/doc/plugins/websetup.mdwn +++ b/doc/plugins/websetup.mdwn @@ -23,5 +23,5 @@ Plugins that should not be enabled/disabled via the web interface can be listed in `websetup_force_plugins` in the setup file. When the setup is saved, the setup file will be rewritten with the new -settings, and the wiki will be refreshed, or rebuilt, to make the setip +settings, and the wiki will be refreshed, or rebuilt, to make the setup changes take effect. diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 8b1378917..5049a4656 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1 +1,74 @@ +This is the [[SandBox]], a page anyone can edit to try out ikiwiki +(version [[!version ]]). +> This is a blockquote. +> +> This is the first level of quoting. +> +> > This is a nested blockquote. +> +>> Without a space works too. +>>> to three levels +> +> Back to the first level. + +Numbered list + +1. First item. + 1. Sub item. +1. Another. +1. And another.. + 1. foo + 2. bar + 3. quz + +Bulleted list + +* item +* *item* +* item +* one + * footballs; runner; unices + * Cool ! + +test _this_ out. + +`test this code block` + +---- + +[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]] +[[!haiku hint="sandbox play"]] + +---- + +## Different sorts of links: + +* [[Features]] +* <http://ikiwiki.info/ikiwiki/formatting/> +* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] +* <http://www.gnu.org/> +* [GNU](http://www.gnu.org/) +* <a href="http://kitenet.net/~joey/">Joey's blog</a> + +---- + +# header1 + +## header2 + +### header3 + +#### header4 + +##### header 5 + +**bold** + +_italic_ + +---- + +This **SandBox** is also a [[blog]]! + +[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ce51faa6d..bdbe323fd 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -143,3 +143,10 @@ setup file. Add yourself to [[IkiWikiUsers]]. And check out the [[tips]] to find out how to get more out of ikiwiki. + +---- + +_Notes_: + +- If you are searching for the file where the users are stored, it's in `your_repository/.ikiwiki/userdb`. The one which is in YOUR REPOSITORY, it cannot be found into your `~/.ikiwiki`. +- If you want to enable a plugin you **WILL HAVE** to add it to the `add_plugins` array in the `*.setup` file (or to use the `--plugin` switch while calling `ikiwiki`). Uncommenting the plugin options/configuration fields in the setup is not **ALWAYS** sufficient. You have been warned. diff --git a/doc/tips/Make_calendar_start_week_on_Monday/discussion.mdwn b/doc/tips/Make_calendar_start_week_on_Monday/discussion.mdwn new file mode 100644 index 000000000..fffd587d8 --- /dev/null +++ b/doc/tips/Make_calendar_start_week_on_Monday/discussion.mdwn @@ -0,0 +1 @@ +It should be pointed out that copying the templates are optional -- you only have to add **week_start_day="1"** to the calendar part of the sidebar. diff --git a/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn b/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn index 39ffc0404..e71e2132d 100644 --- a/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn +++ b/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn @@ -1,3 +1,5 @@ Daniel Burrows [explains](http://algebraicthunk.net/~dburrows/blog/entry/howto-convert-your-blogger-or-blogspot-blog-to-ikiwiki/) how to convert your Blogger/BlogSpot blog to ikiwiki. + +François Marier used a [different approach](http://feeding.cloud.geek.nz/posts/moving-from-blogger-to-ikiwiki-and-branchable/) on a more recent version of Blogger. diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index bb0a4fd97..dc88d9595 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -28,6 +28,10 @@ configuration changes should work anywhere. You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. +* If your wiki is in `~/public_html` and does not appear when you enter the URL given by the installer, check that you have + the userdir mod enabled (there should be simlinks to userdir.load and userdir.conf in /etc/apache2/modes-enabled). If not, + run `a2enmod userdir` and reload apache2. + * You may also want to enable the [[plugins/404]] plugin. To make apache use it, the apache config file will need a further modification to make it use ikiwiki's CGI as the apache 404 handler. diff --git a/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn new file mode 100644 index 000000000..94a4f1577 --- /dev/null +++ b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn @@ -0,0 +1,92 @@ +[[!tag patch]] + +I am copying stuff discussed in the [[forum|/forum/Calendar:_listing_multiple_entries_per_day]], since the [[patch]] only list pages that are todo or bugs. + +If there are several pages created on the same date, the [[calendar directive|/ikiwiki/directive/calendar]] only display the first one. +Here is a patch that: + +- if there is a single entry in one day, does not change anything (compared to the previous version of the calendar plugin); +- if there are several entries, when mouse passes over the day, displays a popup listing all the entries of that day. + +That's all. No new pages for each day, takes as little space as it took before, and only a few lines more in the source. + +The only thing I am not totally happy with is the CSS. We have to say that the text is aligned on the left (otherwise, it is aligned on the right, as is each day of the calendar), but I do not know which place is the more sensible to put that line of CSS in. + +Regards, +-- Louis + + + diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm + index d443198..2c9ed79 100644 + --- a/IkiWiki/Plugin/calendar.pm + +++ b/IkiWiki/Plugin/calendar.pm + @@ -86,8 +86,11 @@ sub format_month (@) { + my $year = $date[5] + 1900; + my $mtag = sprintf("%02d", $month); + + - # Only one posting per day is being linked to. + - $linkcache{"$year/$mtag/$mday"} = $p; + + # Several postings per day + + if (! $linkcache{"$year/$mtag/$mday"}) { + + $linkcache{"$year/$mtag/$mday"} = []; + + } + + push(@{$linkcache{"$year/$mtag/$mday"}}, $p); + } + + my $pmonth = $params{month} - 1; + @@ -221,11 +224,36 @@ EOF + $tag='month-calendar-day-link'; + } + $calendar.=qq{\t\t<td class="$tag $downame{$wday}">}; + - $calendar.=htmllink($params{page}, $params{destpage}, + - $linkcache{$key}, + - noimageinline => 1, + - linktext => $day, + - title => pagetitle(IkiWiki::basename($linkcache{$key}))); + + if ( scalar(@{$linkcache{$key}}) == 1) { + + # Only one posting on this page + + my $page = $linkcache{$key}[0]; + + $calendar.=htmllink($params{page}, $params{destpage}, + + $page, + + noimageinline => 1, + + linktext => $day, + + title => pagetitle(IkiWiki::basename($page))); + + } else { + + $calendar.=qq{<div class='popup'>$day<div class='balloon'>}; + + # Several postings on this page + + $calendar.=qq{<ul>}; + + foreach my $page (@{$linkcache{$key}}) { + + $calendar.= qq{\n\t\t\t<li>}; + + my $title; + + if (exists $pagestate{$page}{meta}{title}) { + + $title = "$pagestate{$page}{meta}{title}"; + + } else { + + $title = pagetitle(IkiWiki::basename($page)); + + } + + $calendar.=htmllink($params{page}, $params{destpage}, + + $page, + + noimageinline => 1, + + linktext => $title, + + title => $title); + + $calendar.= '</li>'; + + } + + $calendar.=qq{\n\t\t</ul>}; + + $calendar.=qq{</div></div>}; + + } + $calendar.=qq{</td>\n}; + } + else { + diff --git a/doc/style.css b/doc/style.css + old mode 100644 + new mode 100755 + index 424d438..b52c72b + --- a/doc/style.css + +++ b/doc/style.css + @@ -323,6 +323,7 @@ div.progress-done { + .popup .paren, + .popup .expand { + display: none; + + text-align: left; + } + .popup:hover .balloon, + .popup:focus .balloon { diff --git a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn index e679d98e0..0dbda8a3a 100644 --- a/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn +++ b/doc/todo/Set_templates_for_whole_sections_of_the_site.mdwn @@ -37,3 +37,5 @@ I've written a new plugin, sectiontemplate, available in the `page_tmpl` branch >>>>> I've implemented this functionality as part of `pagetemplate` as on my "pagetemplate" branch of ikiwiki at https://github.com/rubykat/ikiwiki/tree/pagetemplate - do you want to pull this, Joey? >>>>> It isn't implemented quite the same way as Will did; I have the template name first and the pagespec last, but it does the same thing. >>>>> --[[KathrynAndersen]] + +Just a quick note that Kathryn's branch is ready.[[!template id=gitbranch branch=rubykat/pagetemplate author="[[KathrynAndersen]]"]][[!tag patch]] --[[Will]] diff --git a/doc/todo/inline_directive_should_support_pagination.mdwn b/doc/todo/inline_directive_should_support_pagination.mdwn new file mode 100644 index 000000000..eafe6ee11 --- /dev/null +++ b/doc/todo/inline_directive_should_support_pagination.mdwn @@ -0,0 +1,8 @@ +Ikiwiki should support pagination for index pages. Something like showing only 10 items on the first page, and then having the other items on the other pages. + +Basically, the same page would be rendered multiple times: + +- The index page: rendered normally, but item list is truncated to N items +- The separate pages: rendered with a slice of the item list containing N items (or less for the last page) + +This I think breaks one major assumption: that source pages only generate one page in the output directory. diff --git a/doc/todo/lucene_search_engine.mdwn b/doc/todo/lucene_search_engine.mdwn new file mode 100644 index 000000000..bac9f9130 --- /dev/null +++ b/doc/todo/lucene_search_engine.mdwn @@ -0,0 +1 @@ +There are [some issue](http://www.branchable.com/bugs/Exception:_Cannot_open_tables_at_consistent_revisions_at___47__usr__47__lib__47__perl5__47__Search__47__Xapian__47__WritableDatabase.pm_line_41./#comment-c159ea3f9be35fcd9ed0eeedb162e816) with the current search engine. Sometimes the database gets corrupted and it's not very good at weighting say, the title against the content. For example, [searching for pagespec](http://ikiwiki.info/ikiwiki.cgi?P=pagespec) in this wiki doesn't lead to the [[ikiwiki/pagespec]] page in the first page... but in the third page. In [[different_search_engine]], there was the idea of using Lucene - is there any reason why we should have both, or at least let lucene live in contrib? diff --git a/ikiwiki.spec b/ikiwiki.spec index c353aa7bd..6df191250 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20121017 +Version: 3.20121212 Release: 1%{?dist} Summary: A wiki compiler @@ -20,6 +20,7 @@ BuildRequires: perl(HTML::Template) BuildRequires: perl(CGI::FormBuilder) BuildRequires: perl(CGI::Session) BuildRequires: perl(File::MimeInfo) +BuildRequires: perl(YAML::XS) BuildRequires: gettext BuildRequires: po4a diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 1ed277e37..d1307cde5 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-16 15:16-0400\n" +"POT-Creation-Date: 2012-12-11 12:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,11 +15,11 @@ sub check_trail { sub check_no_trail { my $file=shift; - my $trailname=shift; + my $trailname=shift || qr/\w+/; my $blob=readfile("t/tmp/out/$file"); my ($trailline)=$blob=~/^trail=$trailname\s+(.*)$/m; $trailline="" unless defined $trailline; - ok($trailline !~ /^trail=$trailname\s+/, "no $trailname in $file"); + ok($trailline !~ /^trail=$trailname\s+/, "no trail $trailname in $file"); } my $blob; @@ -96,6 +96,18 @@ write_old_file("sorting.mdwn", '[[!trailitems pagenames="sorting/beginning sorting/middle sorting/end"]] ' . '[[!inline pages="sorting/old or sorting/ancient or sorting/new" trail="yes"]] ' . '[[!traillink linked2]]'); +write_old_file("limited/a.mdwn", "a"); +write_old_file("limited/b.mdwn", "b"); +write_old_file("limited/c.mdwn", "c"); +write_old_file("limited/d.mdwn", "d"); +write_old_file("limited.mdwn", + '[[!inline pages="limited/*" trail="yes" show=2 sort=title]]'); +write_old_file("untrail/a.mdwn", "a"); +write_old_file("untrail/b.mdwn", "b"); +write_old_file("untrail.mdwn", "[[!traillink a]] [[!traillink b]]"); +write_old_file("retitled/a.mdwn", "a"); +write_old_file("retitled.mdwn", + '[[!meta title="the old title"]][[!traillink a]]'); write_old_file("meme.mdwn", <<EOF [[!trail]] @@ -178,6 +190,24 @@ check_trail("sorting/old.html", "n=sorting/ancient p=sorting/new"); check_trail("sorting/ancient.html", "n=sorting/linked2 p=sorting/old"); check_trail("sorting/linked2.html", "n= p=sorting/ancient"); +# If the inline has a limited number of pages, the trail still contains +# everything. +$blob = readfile("t/tmp/out/limited.html"); +ok($blob =~ /<a href="(\.\/)?limited\/a.html">a<\/a>/m); +ok($blob =~ /<a href="(\.\/)?limited\/b.html">b<\/a>/m); +ok($blob !~ /<a href="(\.\/)?limited\/c.html">/m); +ok($blob !~ /<a href="(\.\/)?limited\/d.html">/m); +check_trail("limited/a.html", "n=limited/b p="); +check_trail("limited/b.html", "n=limited/c p=limited/a"); +check_trail("limited/c.html", "n=limited/d p=limited/b"); +check_trail("limited/d.html", "n= p=limited/c"); + +check_trail("untrail/a.html", "n=untrail/b p="); +check_trail("untrail/b.html", "n= p=untrail/a"); + +$blob = readfile("t/tmp/out/retitled/a.html"); +ok($blob =~ /\^ the old title \^/m); + # Make some changes and refresh. These writefile calls don't set an # old mtime, so they're strictly newer than the "old" files. @@ -192,6 +222,16 @@ writefile("sorting.mdwn", "t/tmp/in", readfile("t/tmp/in/sorting.mdwn") . '[[!trailoptions sort="title" reverse="yes"]]'); +writefile("retitled.mdwn", "t/tmp/in", + '[[!meta title="the new title"]][[!traillink a]]'); + +# If the inline has a limited number of pages, the trail still depends on +# everything. +writefile("limited.html", "t/tmp/out", "[this gets rebuilt]"); +writefile("limited/c.mdwn", "t/tmp/in", '[[!meta title="New C page"]]c'); + +writefile("untrail.mdwn", "t/tmp/in", "no longer a trail"); + ok(! system("$command -refresh")); check_trail("add/a.html", "n=add/b p="); @@ -218,4 +258,35 @@ check_trail("sorting/a/b.html", "n=sorting/ancient p=sorting/beginning"); check_trail("sorting/ancient.html", "n=sorting/z/a p=sorting/a/b"); check_trail("sorting/z/a.html", "n= p=sorting/ancient"); +# If the inline has a limited number of pages, the trail still depends on +# everything, so it gets rebuilt even though it doesn't strictly need it. +# This means we could use it as a way to recompute the order of members +# and the contents of their trail navbars, allowing us to fix the regression +# described in [[bugs/trail excess dependencies]] without a full content +# dependency. +$blob = readfile("t/tmp/out/limited.html"); +ok($blob =~ /<a href="(\.\/)?limited\/a.html">a<\/a>/m); +ok($blob =~ /<a href="(\.\/)?limited\/b.html">b<\/a>/m); +ok($blob !~ /<a href="(\.\/)?limited\/c.html">/m); +ok($blob !~ /<a href="(\.\/)?limited\/d.html">/m); +check_trail("limited/a.html", "n=limited/b p="); +check_trail("limited/b.html", "n=limited/c p=limited/a"); +check_trail("limited/c.html", "n=limited/d p=limited/b"); +check_trail("limited/d.html", "n= p=limited/c"); +# Also, b and d should pick up the change to c. This regressed with the +# change to using a presence dependency. +$blob = readfile("t/tmp/out/limited/b.html"); +ok($blob =~ /New C page >/m); +$blob = readfile("t/tmp/out/limited/d.html"); +ok($blob =~ /< New C page/m); + +# Members of a retitled trail should pick up that change. +# This regressed with the change to using a presence dependency. +$blob = readfile("t/tmp/out/retitled/a.html"); +ok($blob =~ /\^ the new title \^/m); + +# untrail is no longer a trail, so these are no longer in it. +check_no_trail("untrail/a.html"); +check_no_trail("untrail/b.html"); + ok(! system("rm -rf t/tmp")); |