From: Joey Hess Date: Sun, 23 Feb 2014 18:24:15 +0000 (-0400) Subject: Merge remote-tracking branch 'remotes/smcv/ready/openid' X-Git-Tag: debian/3.20140227~16 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c4cb6e3c346199929b42ab0c352e33b36f55b72e?hp=1d3b2674c87c9cac395228dac9b60c751d4e06a1 Merge remote-tracking branch 'remotes/smcv/ready/openid' --- diff --git a/.gitignore b/.gitignore index f8991a63d..8528fe9be 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out pm_to_blib +/MYMETA.json /MYMETA.yml *.man /po/cover_db diff --git a/IkiWiki.pm b/IkiWiki.pm index b7080bb0b..e5da04a3b 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -527,6 +527,14 @@ sub getsetup () { safe => 0, # hooks into perl module internals rebuild => 0, }, + useragent => { + type => "string", + default => undef, + example => "Wget/1.13.4 (linux-gnu)", + description => "set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds", + safe => 0, + rebuild => 0, + }, } sub defaultconfig () { @@ -735,6 +743,7 @@ sub debug ($) { } my $log_open=0; +my $log_failed=0; sub log_message ($$) { my $type=shift; @@ -745,9 +754,18 @@ sub log_message ($$) { Sys::Syslog::openlog('ikiwiki', '', 'user'); $log_open=1; } - return eval { - Sys::Syslog::syslog($type, "[$config{wikiname}] %s", join(" ", @_)); + eval { + # keep a copy to avoid editing the original config repeatedly + my $wikiname = $config{wikiname}; + utf8::encode($wikiname); + Sys::Syslog::syslog($type, "[$wikiname] %s", join(" ", @_)); }; + if ($@) { + print STDERR "failed to syslog: $@" unless $log_failed; + $log_failed=1; + print STDERR "@_\n"; + } + return $@; } elsif (! $config{cgi}) { return print "@_\n"; @@ -1490,7 +1508,7 @@ sub preprocess ($$$;$$) { push @params, $val, ''; } } - if ($preprocessing{$page}++ > 3) { + if ($preprocessing{$page}++ > 8) { # Avoid loops of preprocessed pages preprocessing # other pages that preprocess them, etc. return "[[!$command ". @@ -2301,6 +2319,7 @@ sub useragent () { return LWP::UserAgent->new( cookie_jar => $config{cookiejar}, env_proxy => 1, # respect proxy env vars + agent => $config{useragent}, ); } diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 5baa6c179..c0d8f598b 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -351,7 +351,8 @@ sub cgi_getsession ($) { { FileName => "$config{wikistatedir}/sessions.db" }) }; if (! $session || $@) { - error($@." ".CGI::Session->errstr()); + my $error = $@; + error($error." ".CGI::Session->errstr()); } umask($oldmask); diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 28c445913..fbf88c627 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -553,7 +553,9 @@ sub aggregate (@) { }; } if ($@) { - $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)"; + # gettext can clobber $@ + my $error = $@; + $feed->{message}=gettext("feed crashed XML::Feed!")." ($error)"; $feed->{error}=1; debug($feed->{message}); next; @@ -675,7 +677,9 @@ sub write_page ($$$$$) { $template=template($feed->{template}, blind_cache => 1); }; if ($@) { - print STDERR gettext("failed to process template:")." $@"; + # gettext can clobber $@ + my $error = $@; + print STDERR gettext("failed to process template:")." $error"; return; } $template->param(title => $params{title}) diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 83dd120f6..d56dd18ad 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -229,8 +229,10 @@ sub attachment_store { check_canattach($session, $final_filename, $tempfile); }; if ($@) { - json_response($q, $form, $dest."/".$filename, $@); - error $@; + # save error in case called functions clobber $@ + my $error = $@; + json_response($q, $form, $dest."/".$filename, $error); + error $error; } # Move the attachment into holding directory. diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index d15607990..3047869c4 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -400,10 +400,12 @@ sub cgi_editpage ($$) { eval { writefile($file, $config{srcdir}, $content) }; $config{cgi}=1; if ($@) { + # save $@ in case a called function clobbers it + my $error = $@; $form->field(name => "rcsinfo", value => rcs_prepedit($file), force => 1); my $mtemplate=template("editfailedsave.tmpl"); - $mtemplate->param(error_message => $@); + $mtemplate->param(error_message => $error); $form->tmpl_param("message", $mtemplate->output); $form->field("editcontent", value => $content, force => 1); $form->tmpl_param("page_select", 0); diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index c7f1e4fa7..e3ce5e3d9 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -130,9 +130,11 @@ sub filltemplate ($$) { $template=template("/".$template_page); }; if ($@) { + # gettext can clobber $@ + my $error = $@; # Indicate that the earlier preprocessor directive set # up a template that doesn't work. - return "[[!edittemplate ".gettext("failed to process template:")." $@]]"; + return "[[!edittemplate ".gettext("failed to process template:")." $error]]"; } $template->param(name => $page); diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 77c0678bc..4b0e5a86d 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -609,7 +609,7 @@ sub rcs_commit_helper (@) { # So we should ignore its exit status (hence run_or_non). if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) { if (length $config{gitorigin_branch}) { - run_or_cry('git', 'push', $config{gitorigin_branch}); + run_or_cry('git', 'push', $config{gitorigin_branch}, $config{gitmaster_branch}); } } @@ -660,7 +660,9 @@ sub rcs_recentchanges ($) { my @pages; foreach my $detail (@{ $ci->{'details'} }) { my $file = $detail->{'file'}; - my $efile = uri_escape_utf8($file); + my $efile = join('/', + map { uri_escape_utf8($_) } split('/', $file) + ); my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : ""; $diffurl =~ s/\[\[file\]\]/$efile/go; diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 0380bec3d..123dfd364 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -391,7 +391,9 @@ sub preprocess_inline (@) { blind_cache => 1); }; if ($@) { - error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@"; + # gettext can clobber $@ + my $error = $@; + error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $error"; } } my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content')); diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 430194bff..014e78eea 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -92,8 +92,9 @@ sub htmlize (@) { $markdown_sub=\&Markdown::Markdown; } else { + my $error = $@; do "/usr/bin/markdown" || - error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); + error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $error, $!)); $markdown_sub=\&Markdown::Markdown; } } diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index d369e30c9..3b96e4b8e 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -238,7 +238,7 @@ sub getobj ($$) { my $ua; eval q{use LWPx::ParanoidAgent}; if (! $@) { - $ua=LWPx::ParanoidAgent->new; + $ua=LWPx::ParanoidAgent->new(agent => $config{useragent}); } else { $ua=useragent(); diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm index fb0f3ba0a..b2d54af8a 100644 --- a/IkiWiki/Plugin/pinger.pm +++ b/IkiWiki/Plugin/pinger.pm @@ -72,7 +72,7 @@ sub ping { my $ua; eval q{use LWPx::ParanoidAgent}; if (!$@) { - $ua=LWPx::ParanoidAgent->new; + $ua=LWPx::ParanoidAgent->new(agent => $config{useragent}); } else { eval q{use LWP}; diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 53e6af92f..6107a4a22 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -346,6 +346,12 @@ sub pagetemplate (@) { if ($template->query(name => "lang_code")) { $template->param(lang_code => $lang_code); } + if ($template->query(name => "html_lang_code")) { + $template->param(html_lang_code => htmllangcode($lang_code)); + } + if ($template->query(name => "html_lang_dir")) { + $template->param(html_lang_dir => htmllangdir($lang_code)); + } if ($template->query(name => "lang_name")) { $template->param(lang_name => languagename($lang_code)); } @@ -857,6 +863,19 @@ sub lang ($) { return $master_language_code; } +sub htmllangcode ($) { + (my $lang = shift) =~ tr/_/-/; + return $lang; +} + +sub htmllangdir ($) { + my $lang = shift; + if ($lang =~ /^(ar|fa|he)/) { + return 'rtl'; + } + return 'ltr'; +} + sub islanguagecode ($) { my $code=shift; @@ -1053,6 +1072,8 @@ sub otherlanguagesloop ($) { push @ret, { url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page), code => $master_language_code, + html_code => htmllangcode($master_language_code), + html_dir => htmllangdir($master_language_code), language => $master_language_name, master => 1, }; @@ -1063,6 +1084,8 @@ sub otherlanguagesloop ($) { push @ret, { url => urlto_with_orig_beautiful_urlpath($otherpage, $page), code => $lang, + html_code => htmllangcode($lang), + html_dir => htmllangdir($lang), language => languagename($lang), percent => percenttranslated($otherpage), } diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 3df06e652..ccc9cb666 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -41,9 +41,11 @@ sub preprocess (@) { blind_cache => 1); }; if ($@) { + # gettext can clobber $@ + my $error = $@; error sprintf(gettext("failed to process template %s"), htmllink($params{page}, $params{destpage}, - "/templates/$params{id}"))." $@"; + "/templates/$params{id}"))." $error"; } $params{basename}=IkiWiki::basename($params{page}); diff --git a/debian/changelog b/debian/changelog index 41559ea37..f1e5ae990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +ikiwiki (3.20140126) UNRELEASED; urgency=medium + + * Added useragent config setting. Closes: #737121 + Thanks, Tuomas Jormola + * po: Add html_lang_code and html_lang_dir template variables + for the language code and direction of text. + Thanks, Mesar Hameed + * Allow up to 8 levels of nested directives, rather than previous 3 + in directive infinite loop guard. + * git diffurl: Do not escape / in paths to changed files, in order to + interoperate with cgit (gitweb works either way) + Thanks, intrigeri. + * git: Explicity push master branch, as will be needed by git 2.0's + change to push.default=matching by default. + Thanks, smcv + * Deal with nasty issue with gettext clobbering $@ while printing + error message containing it. + Thanks, smcv + + -- Joey Hess Sat, 01 Feb 2014 16:53:35 -0400 + ikiwiki (3.20140125) unstable; urgency=medium * inline: Allow overriding the title of the feed. Closes: #735123 diff --git a/doc/bugs/assumes___34__git_push_origin__34___is_sufficient.mdwn b/doc/bugs/assumes___34__git_push_origin__34___is_sufficient.mdwn new file mode 100644 index 000000000..20d1dd436 --- /dev/null +++ b/doc/bugs/assumes___34__git_push_origin__34___is_sufficient.mdwn @@ -0,0 +1,16 @@ +[[!template id=gitbranch branch=smcv/ready/git-push-origin-master + browse="http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/git-push-origin-master" + author="[[smcv]]"]] +[[!tag patch]] + +git's behaviour when doing "git push origin" is configurable, and the +default is going to change in 2.0. In particular, if you've set +push.default to "nothing" (the "explicit is better than implicit" option), +the regression test will warn: + + fatal: You didn't specify any refspecs to push, and push.default + is "nothing". + 'git push origin' failed: at .../lib/IkiWiki/Plugin/git.pm line 220. + +The solution is to do "git push origin master" instead (but with the +configured remote and branch names). --[[smcv]] diff --git a/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn b/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn index 1f893b980..b55605245 100644 --- a/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn +++ b/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn @@ -55,3 +55,20 @@ Weird... --[[anarcat]] > > I have a stupid [[patch]] in my git repo which just appends a semicolon to the `::magic()` output, but maybe this should be done in another way... > > > > --[[anarcat]] + +> > > If the regex match isn't necessary and it's just about deleting the +> > > parameters, I think I'd prefer something like +> > > +> > > if (! defined $mimetype) { +> > > ... +> > > } +> > > $mimetype =~ s/;.*//; +> > > +> > > but I'd be hesitant to do that without knowing why Joey implemented it +> > > the way it is. If it's about catching a result from file(1) that +> > > is not, in fact, a MIME type at all (empty string or error message +> > > or something), maybe something more like this? +> > > +> > > if (! defined $mimetype || $mimetype !~ s{[-\w]+/[-\w]+(?:;.*)?}{}) +> > > +> > > (or whatever the allowed characters in MIME types are). --[[smcv]] diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn index bbaa53658..4af8c9f72 100644 --- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn +++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn @@ -65,3 +65,6 @@ error: ikiwiki failed > > > Right, I know that. The trick is to find the rabbit hole. :P > > > > > > And I found it. With my dev/proxy-utf8-fail, this doesn't fail anymore. Yay, a [[patch]] ready for commit! --[[anarcat]] + +> > > > I don't see that branch in your git repo, could you repost it please? +> > > > (I'm trying to review some of the pending patches.) --[[smcv]] diff --git a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn index 7c7c016cb..6fc1bf585 100644 --- a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn +++ b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn @@ -30,3 +30,41 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b > legal stuff involved. (from a practical point of view, things are not that > strict, as `apt-file find facebook.png` and `apt-file find flickr.png` > reveal.) --[[chrysn]] + +>> The fundamental problem here is that we want to balance these +>> somewhat incompatible goals: +>> +>> * show users a provider icon that they'll recognise at a glance +>> * don't infringe copyright +>> * don't distribute non-DFSG-licensed things in the source package +>> * don't let miscellaneous OpenID providers track our users +>> +>> A "quick hack" version of removing these would be to have an option to +>> disable the friendly JavaScript OpenID selector and go back to a simple +>> input box. I might implement that option anyway - on websites mainly used +>> by technologists, the OpenID selector is a bit of a waste of time. +>> +>>> Not done yet. -s +>> +>> One way to have recognisable icons would be to ship DFSG imitations of +>> the "real" logos in the underlay. Between gnome-online-accounts and +>> Empathy, we can probably find most of them (mostly or perhaps all done by +>> Jakub Steiner). +>> +>>> [[!template id=gitbranch branch=smcv/ready/openid author="[[smcv]]"]] +>>> [[!tag patch]] +>>> Here's a git branch. I deleted the shut-down ClaimID and MyOpenID providers, +>>> used icons from GNOME Online Accounts and Wordpress where available, and +>>> drew my own for the rest. +>>> [See it in use here](http://blueview.hosted.pseudorandom.co.uk/ikiwiki.cgi?do=prefs) +>>> -s +>> +>> If people want the "real" logos, we could have some code to make IkiWiki +>> download the favicons into transient underlay (which I think is +>> higher-priority?), or into a higher-priority underlay if necessary, +>> during the wiki build, so they'll be served from the wiki's own server. +>> +>>> Not done yet. I'm not sure whether I'm going to bother, but I'd review +>>> someone else's implementation. -s +>> +>> --[[smcv]] diff --git a/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn new file mode 100644 index 000000000..028a5b2fa --- /dev/null +++ b/doc/bugs/editing_gitbranch_template_is_really_slow.mdwn @@ -0,0 +1,17 @@ +On this wiki, editing `templates/gitbranch.mdwn` causes a really slow +refresh, orders of magnitude slower than a full rebuild: a large number of +pages depend on that template, or link to a page that embeds that template, +and so on. + +I suspect that, as with my optimization pass for `album`'s benefit, the +costly thing is evaluating lots of pagespecs. I'm profiling it to see +whether the problem is there are any low-hanging fruit. + +Easy to reproduce offline: + +* comment out the `exclude` option in `docwiki.setup` +* `/usr/bin/perl -Iblib/lib ikiwiki.in -setup docwiki.setup -rebuild` +* `touch templates/gitbranch.mdwn` +* `/usr/bin/perl -Iblib/lib ikiwiki.in -setup docwiki.setup -refresh` + +--[[smcv]] diff --git a/doc/bugs/error_handlers_with_gettext_can_clobber___36____64__.mdwn b/doc/bugs/error_handlers_with_gettext_can_clobber___36____64__.mdwn new file mode 100644 index 000000000..00656c1f0 --- /dev/null +++ b/doc/bugs/error_handlers_with_gettext_can_clobber___36____64__.mdwn @@ -0,0 +1,27 @@ +[[!template id=gitbranch branch=smcv/ready/careful-eval author="[[smcv]]" + browse="http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/careful-eval"]] +[[!tag patch]] + +As noted in the [[!cpan Try::Tiny]] man page, eval/$@ can be quite +awkward in corner cases, because $@ has the same properties and problems +as C's errno. While writing a regression test for definetemplate +in which it couldn't find an appropriate template, I received + + Error: failed to process template + deftmpl + +instead of the intended + + Error: failed to process template + deftmpl template deftmpl not + found + +which turned out to be because the "catch"-analogous block called +gettext before it used $@, and gettext can call define_gettext, +which uses eval. + +Fixed in my branch smcv/ready/careful-eval. Another possibility +for fixing this would be to depend on something like Try::Tiny, +which is already indirectly recommended by ikiwiki, because +[[!cpan RPC::XML]], [[!cpan XML::Feed]], etc., depend on it. +--[[smcv]] diff --git a/doc/bugs/listdirectives_doesn__39__t_register_a_link.mdwn b/doc/bugs/listdirectives_doesn__39__t_register_a_link.mdwn index 87588cb08..b462948eb 100644 --- a/doc/bugs/listdirectives_doesn__39__t_register_a_link.mdwn +++ b/doc/bugs/listdirectives_doesn__39__t_register_a_link.mdwn @@ -34,4 +34,63 @@ The [[ikiwiki/directive/listdirectives]]` directive doesn't register a link betw > --[[smcv]] > No follow-up or objection for a while, so considering this to -> be [[working as designed|done]]. --[[smcv]] +> be working as designed. --[[smcv]] + +> > Seems I'm a bit late to butt in, but would it be possible to have two +> > further phases after the scan phase, the first running map and inline +> > and the second orphan? Then map and inline could log or register their +> > links (obviously somewhere were it won't change the result of the link function) +> > and orphan could take them into account. This logging could be +> > turned on by parameter to not waste time for users not needing this and +> > make it tunable (i.e. so that the user can decide which map directives count and which don't) +> > +> > For someone using map and especially autoindex the output of the orphans directive +> > is simply wrong/useless (at least it is for me). And there is no easy workaround like for listdirectives +> > -- [[holger]] + +>>> Hmm. I think this can be done without introducing any "phases", +>>> even, but it would require each plugin that generates links according +>>> to a pagespec to have either a conditional call into the orphans plugin, +>>> or a call to a new core function in ikiwiki that exists solely to +>>> support the orphans plugin. Something like this, maybe: +>>> +>>> # in map.pm, inline.pm, pagestats.pm etc., at scan time +>>> if (IkiWiki::Plugin::orphans->can("add_reachable")) { +>>> IkiWiki::Plugin::orphans::add_reachable($page, $pagespec); +>>> } +>>> +>>> # in orphans.pm (pseudocode; note that this does not *evaluate* +>>> # $pagespec, only stores it, so it's OK to do this at scan time) +>>> sub needsbuild ($pages) +>>> for each page in $pages +>>> clear $pagestate{location}{orphans}{reachable} +>>> sub reachable ($location, $pagespec) +>>> add $pagespec to @{$pagestate{location}{orphans}{reachable}} +>>> +>>> # in preprocess function in orphans.pm (pseudocode) +>>> # executed at build time, not at scan time, so pagespecs work +>>> +>>> for each maybe_orphan with no links to it +>>> for each location with a list of reachable pagespecs +>>> make the page with the orphans directive depend on \ +>>> the page that is the location +>>> for each of those pagespecs +>>> if pagespec matches orphan +>>> take orphan off the list +>>> go to next orphan +>>> output list of orphans +>>> +>>> (Maybe parentlinks should also annotate the parent/ancestors of +>>> each page as reachable from that page.) +>>> +>>> Do other people (mainly Joey) think that'd be acceptable, or +>>> too intrusive? +>>> +>>> Taking this off the list of resolved bugs again while we think about it. +>>> +>>> I suspect that in the presence of autoindex, what you really want might +>>> be less "there's a link to it" and more "there's a path to it from +>>> the root of the wiki", which is why I called the proposed function +>>> "add_reachable". On the other hand, maybe that's too computationally +>>> intensive to actually do; I haven't tried it. +>>> --[[smcv]] diff --git a/doc/bugs/pages_under_templates_are_invalid.mdwn b/doc/bugs/pages_under_templates_are_invalid.mdwn index f7e115d48..c031543c1 100644 --- a/doc/bugs/pages_under_templates_are_invalid.mdwn +++ b/doc/bugs/pages_under_templates_are_invalid.mdwn @@ -14,3 +14,6 @@ Maybe just encode all < and > when compling pages within the templates fol > I never noticed this bug, since it only happens if the htmlscrubber is > disabled. --[[Joey]] + +>> My `templatebody` branch on [[template creation error]] fixes this. +>> --[[smcv]] diff --git a/doc/bugs/preprocessing_loop_control_too_tight.mdwn b/doc/bugs/preprocessing_loop_control_too_tight.mdwn index f1a9bc9a7..807d6b7ef 100644 --- a/doc/bugs/preprocessing_loop_control_too_tight.mdwn +++ b/doc/bugs/preprocessing_loop_control_too_tight.mdwn @@ -17,3 +17,7 @@ index 75c9579..ad0f8b0 100644 [[!tag patch]] + +> [[Seems reasonable|users/smcv/yesplease]] --smcv + +>> [[done]] --[[Joey]] diff --git a/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn b/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn index dad974a81..b641f2db2 100644 --- a/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn +++ b/doc/bugs/syslog_fails_with_non-ASCII_wikinames.mdwn @@ -21,3 +21,7 @@ Yet I am not sure how to fix that kind of problem in Perl... --[[anarcat]] > I have improved a little the error handling in log_message() so that we see *something* when syslog fails, see the branch documented above. I can also confirm that reverting [[todo/syslog_should_show_wiki_name]] fixes the bug. Finally, I have a unit test that reproduces the problem in git, and a working [[!taglink patch]] for the bug, again in git. > > > One last note: I noticed that this problem also happens elsewhere in ikiwiki. For example, the [[plugins/notifyemail]] plugin will silently fail to send notifications if the pages contain unicode. The [[plugins/notifychanges]] plugin I am working on (in [[todo/option to send only the diff in notifyemail]]) seems to be working around the issue so far, but there's no telling which similar problem are out there. + +>> [[I'd merge it|/users/smcv/yesplease]]. --[[smcv]] + +>>> I've merged it, but I don't feel it fixes this bug. --[[Joey]] diff --git a/doc/bugs/template__95__syntax_test_is_incomplete.mdwn b/doc/bugs/template__95__syntax_test_is_incomplete.mdwn new file mode 100644 index 000000000..f9e3bf362 --- /dev/null +++ b/doc/bugs/template__95__syntax_test_is_incomplete.mdwn @@ -0,0 +1,8 @@ +[[!template id=gitbranch branch=smcv/ready/template-syntax-test + browse="http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/template-syntax-test" + author="[[smcv]]"]] +[[!tag patch]] + +`t/template_syntax.t` looks as though it's meant to check the syntax of +`doc/templates/*.mdwn` as well as `templates/*.tmpl`, but it doesn't. +Patch in my git repository. --[[smcv]] diff --git a/doc/bugs/template_creation_error.mdwn b/doc/bugs/template_creation_error.mdwn index 5d27c3472..2468e3c4f 100644 --- a/doc/bugs/template_creation_error.mdwn +++ b/doc/bugs/template_creation_error.mdwn @@ -110,8 +110,6 @@ Please, let me know what to do to avoid this kind of error. > > --[[smcv]] ->> [[!template id=gitbranch author="[[smcv]]" branch=smcv/definetemplate]] ->> [[!tag patch]] >> OK, here is a branch implementing what I said. It adds the `definetemplate` >> directive to [[plugins/goodstuff]] as its last commit. >> @@ -195,3 +193,14 @@ Please, let me know what to do to avoid this kind of error. >>>>> the right thing to do in this situation. >>>>> >>>>> --[[chrysn]] + +>>>>>> [[!template id=gitbranch author="[[smcv]]" branch=smcv/ready/templatebody + browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/templatebody]] +>>>>>> [[!tag patch]] +>>>>>> Branch and directive renamed to `ready/templatebody` as chrysn suggested. +>>>>>> It's on-by-default now (or will be if that branch is merged). +>>>>>> Joey, any chance you could review this? +>>>>>> +>>>>>> There is one known buglet: `template_syntax.t` asserts that the entire +>>>>>> file is a valid HTML::Template, whereas it would ideally be doing the +>>>>>> same logic as IkiWiki itself. I don't think that's serious. --[[smcv]] diff --git a/doc/forum/How_can_I_invert_the_banned__95__user_check__63__.mdwn b/doc/forum/How_can_I_invert_the_banned__95__user_check__63__.mdwn new file mode 100644 index 000000000..2436b2e56 --- /dev/null +++ b/doc/forum/How_can_I_invert_the_banned__95__user_check__63__.mdwn @@ -0,0 +1,33 @@ +Trying to lockdown a wiki so that it can only be edited by certain users and figured I'd just set + + banned_users: + - !user(myadmin) + +in my config but it doesn't work. I'm sure I must be doing something daft? + +PS: the user is authenticated via 'httpauth', would that make a difference? + +> That's not how `banned_users` works. Make yourself an admin: +> +> adminuser: +> - myadmin +> +> and disallow editing by non-admins: +> +> locked_pages: '*' +> +> You can enable the `opendiscussion` and/or `anonok` plugins if you want +> unprivileged users, perhaps logging in with an OpenID, to be able to +> edit discussion pages (if enabled via `discussion`) or post comments. +> +> You can also relax the `locked_pages` setting if you want unprivileged +> users to be able to edit certain areas of the site. +> +> --[[smcv]] + +>> That was my initial setup but it wasn't working and I got caught-up on the `banned_user` idea. It would seem I was getting tricked by some credential-caching-weirdness. Fired up another browser and `locked_pages` works perfectly. Thanks. -- fergus + +>>> Browsers generally remember HTTP auth credentials until they're closed +>>> or get a 401 error, and don't generally have a way to "log out". +>>> As far as I'm aware, there's nothing that [[plugins/httpauth]] can +>>> do about that. --[[smcv]] diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn index 2b56bd70b..e01eccb92 100644 --- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn +++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn @@ -1,4 +1,4 @@ -as in title, how to align text to the right? +As in title, how to align text to the right? > Add to your local.css a class that aligns text to the right: @@ -13,3 +13,40 @@ as in title, how to align text to the right? > [[templates/note]] template does something similar. --[[Joey]] >> Thanks! + +----- +
+[[!format mdwn """ +This is my text with [a markdown link](#). + +Here's a *second* paragraph. +"""]] +
+ +> There is more than one way to do it. If [[plugins/format]] is enabled, then this: +> +>
+> \[[!format mdwn """ +> This is my text with [a markdown link](#). +> +> Here's a *second* paragraph. +> """]] +>
+> +> is rendered like the box in this page. +> +> (I'm using the `notebox` class used by the `note` template here, but you could +> use any class.) --[[smcv]] + +----- +> Doing this myself and noted that [[ikiwiki/markdown]] down does not allow the enclosure of block level elements directly; and thus we cannot switch the `span` suggested above for `div` in changing block level elements (not if you wish to include markdown, anyway). For example, I want to create a paragraph (with markdown text) which is right aligned, and so add the following + +>> +>> This is my text with [a markdown link](/) +>> + +> The *correct* thing to do here is create a template (as indicated above) **but** a workaround I found useful was to over-ride the `inline` nature of the `span` element, as follows + +>> .align_right { display: block ; text-align: right ; } + +> you may also like to remove the padding and margins since they will be provided by the enclosing block. -- fergus diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn index 569c2818f..a6f301dd3 100644 --- a/doc/ikiwiki/directive/edittemplate.mdwn +++ b/doc/ikiwiki/directive/edittemplate.mdwn @@ -2,7 +2,7 @@ The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc This directive allows registering template pages, that provide default content for new pages created using the web frontend. To register a -template, insert a [[ikiwiki/directive/template]] directive on some other +template, insert an [[ikiwiki/directive/edittemplate]] directive on some other page. \[[!edittemplate template="bugtemplate" match="bugs/*"]] diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 70d5042b7..ea0e98d43 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -50,7 +50,6 @@ Projects & Organizations * [Public Domain collection of Debian related tips & tricks](http://dabase.com/tips/) - please add any tips too * [Finnish Debian community](http://debian.fi) * [dist-bugs](http://dist-bugs.kitenet.net/) -* [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de) * [monkeysphere](http://web.monkeysphere.info/) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) @@ -89,6 +88,7 @@ Projects & Organizations * [[Nos oignons|http://nos-oignons.net]] - Tor exit nodes funded by the community. * [[CAS Libres|http://cas-libres.poivron.org]] - A French feminist radio program. * [[Les Barricades|http://barricades.int.eu.org]] - A French socialist choir (CSS has been adapted from the one of [[Grésille|http://www.gresille.org]]). +* [DKØTU Amateur Radio Station](http://www.dk0tu.de), TU Berlin Personal sites and blogs ======================== diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 158dc3ce5..06c2d7ca7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -110,3 +110,9 @@ This is some preformatted text. Each line is proceeded by four spaces. ...Now why doesn't it work like that on my copy of ikiwiki? :( + +Räksmörgås. + +`pre?` + + diff --git a/doc/sandbox/New_blog_entry.mdwn b/doc/sandbox/New_blog_entry.mdwn new file mode 100644 index 000000000..932728561 --- /dev/null +++ b/doc/sandbox/New_blog_entry.mdwn @@ -0,0 +1,3 @@ +Räksmörgåstest. + +ハッカー diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn index 4fdf937ff..853da9280 100644 --- a/doc/templates/gitbranch.mdwn +++ b/doc/templates/gitbranch.mdwn @@ -1,8 +1,8 @@ - +
Available in a [[!taglink /git]] repository [[!taglink branch|/branches]].
-Branch:
-Author:
- +Branch:
+Author:
+
This template is used to create an infobox for a git branch. It uses these parameters: diff --git a/doc/todo/Option_linktext_for_pagestats_directive.mdwn b/doc/todo/Option_linktext_for_pagestats_directive.mdwn index 16fc3c512..8bbb7c2cf 100644 --- a/doc/todo/Option_linktext_for_pagestats_directive.mdwn +++ b/doc/todo/Option_linktext_for_pagestats_directive.mdwn @@ -182,3 +182,15 @@ Here is a [[patch]] that adds an option `disp` for the [[ikiwiki/directive/pages Regards, -- [[Louis|spalax]] + +> Saved to my git repository as `contrib/spalax/pagestats-disp`. +> I'd rather find a better name than `disp` for the parameter. +> I think `display` would be an improvement, but that doesn't solve the +> problem of "it's a synonym for show, and non-obvious which is which". +> Maybe `linktext`? +> +> It's unfortunate that `map` and `pagestats` have different meanings for +> the `show` parameter. I'm tempted to propose a patch that adds something +> like `limit` (by analogy with SQL) or `max` as the canonical name for the +> "number of things to match" parameter, at which point a non-numeric +> `show` could mean this thing. --[[smcv]] diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn index 7ec95b536..4f83c8bf5 100644 --- a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn +++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn @@ -1,3 +1,4 @@ +[[!template id=gitbranch branch=anderbubble/edittemplate author="Jonathon Anderson"]] [[!tag wishlist patch]] I use a default template for all new pages: @@ -17,3 +18,31 @@ I've already made these changes in my installation, and have made my patches ava Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagespec}` mean that a `cgi` rebuild is necessary (for reasons I don't entirely understand); but I think that's preferable to creating an entirely separate `$pagestate` namespace for storing parameters. That said, I'm not really a perl programmer, so corrections are welcome. > I like this patch. I hate seeing things I've already read get marked as unread in my rss feed. -- [[JoshBBall]] + +>> (I don't have commit access so take this with a pinch of salt - +>> I'm just trying to help deal with the code-review backlog.) +>> +>> I mostly like the first and third patches in the branch (adding v4 +>> (random) UUIDs, and adding the timestamps). I'd be tempted to rename +>> `time` and `formatted_time` to `iso_time` and `time`, but that's +>> a matter of taste, and perhaps people with commit access have +>> stronger opinions one way or another. I haven't researched +>> whether there's precendent for any particular naming style +>> elsewhere in ikiwiki. +>> +>> The UUID bit would require adding some reference to libuuid-tiny-perl +>> to the Debian packaging - I think a `Recommends` is too strong +>> but a `Suggests` seems OK. +>> +>> I don't like the second patch (adding URL-namespaced UUID support). +>> I'm having a hard time thinking of any situation in which a v4 UUID +>> would be unsuitable, which means it's unnecessary complexity. +>> FYI, the reason that it makes a rebuild is necessary is that +>> you've restructured `$pagestate`, which is carried over from one +>> refresh to the next (that's its purpose), and you haven't +>> built in any migration or backwards-compatibility code that will +>> cope with it being in the old format. My inclination would be to +>> drop that patch. If there's a really good reason to prefer +>> v3/v5 UUIDs, please describe it and I'll try to suggest some +>> better way based on that, maybe global configuration in `$config`. +>> --[[smcv]] diff --git a/doc/todo/expose_html_language_and_direction.mdwn b/doc/todo/expose_html_language_and_direction.mdwn index c68834456..f321e4f52 100644 --- a/doc/todo/expose_html_language_and_direction.mdwn +++ b/doc/todo/expose_html_language_and_direction.mdwn @@ -8,3 +8,8 @@ This means: 2. Content can correctly be tagged with the language code, to enable screenreaders and other accessibility providers to render/speak the text in the correct language. The [[patch]] is currently being used on http://addons.nvda-project.org and seems to work well. --[[mhameed]] + +> I don't have commit access, but it [[seems reasonable|/users/smcv/yesplease]]. +> --[[smcv]] + +>> [[done]]] --[[Joey]] diff --git a/doc/todo/missingparents.pm.mdwn b/doc/todo/missingparents.pm.mdwn index cecac7a94..b257760ce 100644 --- a/doc/todo/missingparents.pm.mdwn +++ b/doc/todo/missingparents.pm.mdwn @@ -30,6 +30,12 @@ This patch, or one like it, would enable better blogging support, by adding the ability to hierarchically organize blog posts and automatically generate structural pages for year, month, or day. Please apply. --Ethan +> This looks a lot like [[plugins/autoindex]], except limited to a subset +> of pages, and with different templates according to the page it's used +> on. Perhaps it could become several enhancements for autoindex? --[[smcv]] + +---- + 
 Index: IkiWiki/Render.pm
 ===================================================================
diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn
index f379edee8..ab6172ad1 100644
--- a/doc/todo/support_linking_to_cgit.mdwn
+++ b/doc/todo/support_linking_to_cgit.mdwn
@@ -27,6 +27,19 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`?
 
 >>>> Ping? --[[intrigeri]]
 
+>>>> Normally, my tendency towards pedantic preservation of existing APIs
+>>>> would make me implement a new token \[[file_less_escaped]] or
+>>>> something, analogous to `%s` vs. `%S` in [[shortcuts]]; but
+>>>> gitweb and cgit are both OK with `/` not being escaped, whereas
+>>>> only gitweb allows it to be escaped as `%2F`, so I think your
+>>>> solution is fine. Also, it would need a much better name than
+>>>> \[[file_less_escaped]], and I can't think of one.
+>>>>
+>>>> I don't have commit access to ikiwiki.info, but if I did,
+>>>> [[I'd merge this|/users/smcv/yesplease]]. --[[smcv]]
+
+>>>>> [[merged|done]] --[[Joey]]
+
 [[wishlist]]
 
 [[!tag patch]]
diff --git a/doc/users/holger.mdwn b/doc/users/holger.mdwn
new file mode 100644
index 000000000..9f0e3c017
--- /dev/null
+++ b/doc/users/holger.mdwn
@@ -0,0 +1,3 @@
+I'm sysadmin at a german university. 
+
+I'm using ikiwiki as personal wiki at work and at home.
diff --git a/doc/users/smcv.mdwn b/doc/users/smcv.mdwn
index 59d1affba..a4eb564ce 100644
--- a/doc/users/smcv.mdwn
+++ b/doc/users/smcv.mdwn
@@ -7,4 +7,4 @@ My repository containing ikiwiki branches:
 * gitweb: http://git.pseudorandom.co.uk/smcv/ikiwiki.git
 * anongit: git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git
 
-Currently thinking about a [[users/smcv/gallery]] plugin.
+Recently tried to [[help with the review backlog|yesplease]].
diff --git a/doc/users/smcv/yesplease.mdwn b/doc/users/smcv/yesplease.mdwn
new file mode 100644
index 000000000..b100b374e
--- /dev/null
+++ b/doc/users/smcv/yesplease.mdwn
@@ -0,0 +1,7 @@
+A tag for patches that I would merge if I had commit access to ikiwiki,
+in the hope that it's a useful shortlist for committers to look at.
+They're mirrored in my git repository under the `ready/*` namespace.
+
+[[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and
+   !link(todo/done) and link(users/smcv/yesplease) and !*/Discussion"
+   archive="yes"]]
diff --git a/t/git.t b/t/git.t
index 6d847dfb0..0396ae065 100755
--- a/t/git.t
+++ b/t/git.t
@@ -16,13 +16,14 @@ BEGIN {
 		die $@;
 	}
 }
-use Test::More tests => 18;
+use Test::More tests => 22;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "git";
 $config{srcdir} = "$dir/src";
+$config{diffurl} = '/nonexistent/cgit/plain/[[file]]';
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
@@ -94,4 +95,26 @@ is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 IkiWiki::rcs_commit_staged(message => "Remove the 5th page");
 
+# diffurl escaping
+ok(mkdir($config{srcdir}."/diffurl_dir"));
+my $test3 = readfile("t/test1.mdwn");
+writefile('test3.mdwn', $config{srcdir}."/diffurl_dir", $test3);
+IkiWiki::rcs_add("diffurl_dir/test3.mdwn");
+IkiWiki::rcs_commit(
+	file => "diffurl_dir/test3.mdwn",
+	message => "Added a page in diffurl_dir",
+	token => "moo",
+);
+
+@changes = IkiWiki::rcs_recentchanges(5);
+
+is($#changes, 4);
+is($changes[0]{pages}[0]{"page"}, "diffurl_dir/test3");
+
+unlike(
+	$changes[0]{pages}[0]{"diffurl"},
+	qr{%2F}m,
+	q{path separators are preserved when UTF-8scaping filename}
+);
+
 system "rm -rf $dir";
diff --git a/t/syslog.t b/t/syslog.t
new file mode 100644
index 000000000..ffe8635b3
--- /dev/null
+++ b/t/syslog.t
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 5;
+use utf8;
+
+BEGIN { use_ok("IkiWiki"); }
+
+$IkiWiki::config{verbose} = 1;
+$IkiWiki::config{syslog} = 1;
+
+$IkiWiki::config{wikiname} = 'ASCII';
+is(debug('test'), '', 'plain ASCII syslog');
+$IkiWiki::config{wikiname} = 'not ⒶSCII';
+is(debug('test'), '', 'UTF8 syslog');
+my $orig = $IkiWiki::config{wikiname};
+is(debug('test'), '', 'check for idempotency');
+is($IkiWiki::config{wikiname}, $orig, 'unchanged config');