Merge branch 'master' of ssh://git.ikiwiki.info

master
Joey Hess 2013-01-29 08:09:32 +11:00
commit fce3cef33a
4 changed files with 49 additions and 5 deletions

View File

@ -0,0 +1,16 @@
recentchanges.pm sets the template variable HAS_DIFFURL to 1 based solely on whether or not diffurl is defined. I found that diffurl was defined, but empty. The recentchanges template depends on this for recentchangesdiff to properly function -- diff toggling is dependent on HAS_DIFFURL evaluating to false. Adding a check for a non-zero length diffurl fixed the issue for me. A patch against ikiwiki-3.20121212 is as follows:
--- a/IkiWiki/Plugin/recentchanges.pm 2013-01-27 20:08:59.000000000 -0800
+++ b/IkiWiki/Plugin/recentchanges.pm 2013-01-27 20:08:30.000000000 -0800
@@ -181,7 +181,8 @@ sub store ($$$) {
else {
$_->{link} = pagetitle($_->{page});
}
- if (defined $_->{diffurl}) {
+ if (defined $_->{diffurl} &&
+ length($_->{diffurl}) > 0) {
$has_diffurl=1;
}
(There should be one more line at the bottom with a single space on it...)

View File

@ -75,6 +75,7 @@ think about merging them. This is recommended. :-)
* [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git`
* [[ttw]] `git://github.com/ttw/ikiwiki.git`
* [[anarcat]] `git://src.anarcat.ath.cx/ikiwiki`
* anderbubble `git://civilfritz.net/ikiwiki.git`
## branches

View File

@ -171,8 +171,18 @@ Bugs found and fixed so far:
> Merged to current head. --[[Joey]]
* Return bounded output from `rcs_diff()` when asked, as the API states.
(6753235d98a3903364af26c0614106c47d93ae35)
* When adding a text file under a name formerly tracked as binary,
fix CVS keyword substitution behavior by explicitly setting `-kkv`.
(e45175d5454cc72b261507260accb309f13b5e8b)
----
Hi! Bugfixes in `schmonz/cvs` I'd like to see merged:
* `6753235d`: Return bounded output from `rcs_diff()` when asked, as
the API states.
* `e45175d5`: Always explicitly set CVS keyword substitution behavior.
Fixes behavior when a text file is added under a name formerly
used for a binary file.
* `b30cacdf`: If the previous working directory no longer exists after
a CVS operation, don't try to `chdir()` back to it afterward.
These are all the diffs that exist on the branch, so if the changes
are acceptable you should be able to simply merge the branch.
--[[schmonz]]

View File

@ -0,0 +1,17 @@
[[!tag wishlist patch]]
I use a default template for all new pages:
\[[!meta title="<TMPL_VAR name>"]]
\[[!meta author=]]
\[[!meta date="<TMPL_VAR time>"]]
\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]
\[[!tag ]]
This encourages me to include useful metadata on the page. In particular, though, I've modified the `edittemplate` plugin to generate a uuid for use in the guid, for use in `inline`. Importantly, this keeps `inline` from flooding aggregators when I rename these pages.
I've also noticed that IkiWiki seems to use the creation time for the generated page for the page date. This means that when I do a rebuild, `inline`d pages get shuffled. The inclusion of a `time` variable in `edittemplate` (and in a `meta` declaration for all such pages) prevents the date from changing unexpectedly.
I've already made these changes in my installation, and have made my patches available in the `edittemplate` branch of my repository, which [[I've posted|git]].
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.