aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-06-29 15:53:51 +0200
committerintrigeri <intrigeri@boum.org>2010-06-29 15:53:51 +0200
commit1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch)
treeedfeed77be4a56ed06095bd67eb7cbc05a1a1eca
parentb225fdc44d4b3d2853db622d59aed7b59788aeec (diff)
parentbe60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff)
downloadikiwiki-1786b106a9c7f448136ff47d9b6dd26d48a5dd2e.tar
ikiwiki-1786b106a9c7f448136ff47d9b6dd26d48a5dd2e.tar.gz
Merge remote branch 'upstream/master' into prv/po
Conflicts: doc/plugins/po.mdwn
-rw-r--r--.gitattributes1
-rw-r--r--IkiWiki/Plugin/hnb.pm4
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/po_vs_templates.mdwn17
-rw-r--r--doc/ikiwikiusers.mdwn1
-rw-r--r--doc/plugins/contrib/field/discussion.mdwn2
-rw-r--r--doc/plugins/po.mdwn10
-rw-r--r--doc/rcs/cvs.mdwn5
-rw-r--r--doc/sandbox.mdwn6
-rw-r--r--doc/setup/byhand.mdwn2
-rw-r--r--doc/todo/Add_HTML_support_to_po_plugin.mdwn7
-rw-r--r--doc/todo/Fix_selflink_in_po_plugin.mdwn2
-rw-r--r--doc/users/schmonz.mdwn2
-rwxr-xr-xt/bazaar.t7
-rwxr-xr-xt/cvs.t7
-rwxr-xr-xt/git.t7
-rwxr-xr-xt/mercurial.t7
-rwxr-xr-xt/svn.t7
18 files changed, 80 insertions, 16 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5d425843f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index 32c9cf3ad..5157a6b93 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -33,8 +33,8 @@ sub htmlize (@) {
# hnb outputs version number etc. every time to STDOUT, so
# using files makes it easier to seprarate.
- my $tmpin = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" );
- my $tmpout = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
+ my ($infh, $tmpin) = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" );
+ my ($outfh, $tmpout) = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
open(TMP, '>', $tmpin) or die "Can't write to $tmpin: $!";
print TMP $params{content};
diff --git a/debian/changelog b/debian/changelog
index ae1d23479..15ae21a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
* Fixed some confusion and bugginess about whether
rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
(Make it relative like everything else.)
+ * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
+ and prevented actually rendering hnb files.
-- Joey Hess <joeyh@debian.org> Wed, 23 Jun 2010 15:30:04 -0400
diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
new file mode 100644
index 000000000..a0ccc5f53
--- /dev/null
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -0,0 +1,17 @@
+The po plugin's protection against processing loops (i.e. the
+alreadyfiltered stuff) is playing against us: the template plugin
+triggers a filter hooks run with the very same ($page, $destpage)
+arguments pair that is used to identify an already filtered page.
+
+Processing an included template can then mark the whole translation
+page as already filtered, which prevented `po_to_markup` to be called on
+the PO content.
+
+Symptoms: the unprocessed gettext file goes unfiltered to the
+generated HTML.
+
+This has been fixed in my po branch.
+
+-- [[intrigeri]]
+
+[[!tag patch]]
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8fb348c3d..e2465108a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -147,6 +147,7 @@ Personal sites and blogs
* [Ertug Karamatli](http://pages.karamatli.com)
* [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
* [Daniel Wayne Armstrong](http://circuidipity.com/)
+* [Mukund](https://www.mukund.org/)
Please feel free to add your own ikiwiki site!
diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 103e061e5..5f4c9b942 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -324,3 +324,5 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
>>> the side-effects, but use `field` as an interface to get the values of those special fields.
>>> --[[KathrynAndersen]]
+
+I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)? <http://slides.html5rocks.com/#slide19> -- [[Will]]
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index dc0b638e2..30bac7068 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -281,6 +281,9 @@ Also, this may only happen if the page being linked to is coming from an
underlay, and the underlays lack translation to a given language.
--[[Joey]]
+> Any simple testcase to reproduce it, please? I've never seen this
+> happen yet. --[[intrigeri]]
+
Double commits of po files
--------------------------
@@ -295,11 +298,18 @@ and then committed again. The second commit makes this change:
Same thing happens when a change to an existing page triggers a po file
update. --[[Joey]]
+> * The s/utf-8/UTF-8 part is fixed in my po branch.
+> * The ENCODING\n part is due to an inconsistency in po4a, which
+> I've just send a patch for. --[[intrigeri]]
+
Ugly messages with empty files
------------------------------
If there are empty .mdwn files, the po plugin displays some ugly messages.
+> This is due to a bug in po4a (not checking definedness of a
+> variable). One-liner patch sent. --[[intrigeri]]
+
Translation of directives
-------------------------
diff --git a/doc/rcs/cvs.mdwn b/doc/rcs/cvs.mdwn
index f0bd0f6f0..9beb08ece 100644
--- a/doc/rcs/cvs.mdwn
+++ b/doc/rcs/cvs.mdwn
@@ -20,8 +20,9 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn
* creates a repository,
* imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS),
* configures the post-commit hook in `CVSROOT/loginfo`.
-* CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below).
### To do
-* Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records.
+* Have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce commits into changesets. Reasons:
+ 7. Obviates the need to scrape the repo's complete history to determine the last N changesets. (Repositories without such records can fall back on the `cvsps` and `File::ReadBackwards` code.)
+ 7. Arranges for ikiwiki to be run once per changeset, rather than CVS's once per committed file (!), which is a waste at best and bug-inducing at worst. (Currently, on multi-directory commits, only the first directory's changes get mentioned in [[recentchanges|plugins/recentchanges]].)
* Perhaps prevent web edits from attempting to create `.../CVS/foo.mdwn` (and `.../cvs/foo.mdwn` on case-insensitive filesystems); thanks to the CVS metadata directory, the attempt will fail anyway (and much more confusingly) if we don't.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8ecaf1cb9..4c8621f1c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,11 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
+
# Header
## Subheader2
diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index afd1ac27f..86cff5af4 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -177,7 +177,7 @@ about using the git repositories.
Once your wiki is checked in to the revision control system, you should
configure ikiwiki to use revision control. Edit your ikiwiki.setup, set
-`rcs` to the the revision control system you chose to use. Be careful,
+`rcs` to the revision control system you chose to use. Be careful,
you may need to use the 'fullname'. For example, 'hg' doesn't work, you
should use mercurial. Be sure to set `svnrepo` to the directory for your
repository, if using subversion. Uncomment the configuration for the wrapper
diff --git a/doc/todo/Add_HTML_support_to_po_plugin.mdwn b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
new file mode 100644
index 000000000..ec29e4f61
--- /dev/null
+++ b/doc/todo/Add_HTML_support_to_po_plugin.mdwn
@@ -0,0 +1,7 @@
+The HTML page type should be fully supported by the PO plugin: po4a's
+HTML support is able to extract translatable strings and to disregard
+the rest.
+
+This is implemented in my po branch, please review. --[[intrigeri]]
+
+[[!tag patch]]
diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index 87fa38911..b83d2814a 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -6,3 +6,5 @@ isn't. --[[intrigeri]]
Fixed in my po branch. --[[intrigeri]]
[[!tag patch]]
+
+> bump?
diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index ed3332bf9..ec282c990 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -2,4 +2,4 @@
[[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
-In progress: a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/).
+I've also written a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which may or may not be of general utility.
diff --git a/t/bazaar.t b/t/bazaar.t
index 3e54ec4dc..cd840fbe1 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -6,11 +6,14 @@ BEGIN {
$dir = "/tmp/ikiwiki-test-bzr.$$";
my $bzr=`which bzr`;
chomp $bzr;
- if (! -x $bzr || ! mkdir($dir)) {
+ if (! -x $bzr) {
eval q{
- use Test::More skip_all => "bzr not available or could not make test dir"
+ use Test::More skip_all => "bzr not available"
}
}
+ if (! mkdir($dir)) {
+ die $@;
+ }
}
use Test::More tests => 17;
diff --git a/t/cvs.t b/t/cvs.t
index 96359ab6e..5ed377ed5 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -8,11 +8,14 @@ BEGIN {
chomp $cvs;
my $cvsps=`which cvsps`;
chomp $cvsps;
- if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) {
+ if (! -x $cvs || ! -x $cvsps) {
eval q{
- use Test::More skip_all => "cvs or cvsps not available or could not make test dir"
+ use Test::More skip_all => "cvs or cvsps not available"
}
}
+ if (! mkdir($dir)) {
+ die $@;
+ }
foreach my $module ('File::ReadBackwards', 'File::MimeInfo') {
eval qq{use $module};
if ($@) {
diff --git a/t/git.t b/t/git.t
index ee778ebf0..6d847dfb0 100755
--- a/t/git.t
+++ b/t/git.t
@@ -7,11 +7,14 @@ BEGIN {
$dir="/tmp/ikiwiki-test-git.$$";
my $git=`which git`;
chomp $git;
- if (! -x $git || ! mkdir($dir)) {
+ if (! -x $git) {
eval q{
- use Test::More skip_all => "git not available or could not make test dir"
+ use Test::More skip_all => "git not available"
}
}
+ if (! mkdir($dir)) {
+ die $@;
+ }
}
use Test::More tests => 18;
diff --git a/t/mercurial.t b/t/mercurial.t
index b64ea8e56..4918fc76e 100755
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -6,11 +6,14 @@ BEGIN {
$dir = "/tmp/ikiwiki-test-hg.$$";
my $hg=`which hg`;
chomp $hg;
- if (! -x $hg || ! mkdir($dir)) {
+ if (! -x $hg) {
eval q{
- use Test::More skip_all => "hg not available or could not make test dir"
+ use Test::More skip_all => "hg not available"
}
}
+ if (! mkdir($dir)) {
+ die $@;
+ }
}
use Test::More tests => 11;
diff --git a/t/svn.t b/t/svn.t
index 82b71b5fc..cce8452a6 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -8,11 +8,14 @@ BEGIN {
chomp $svn;
my $svnadmin=`which svnadmin`;
chomp $svnadmin;
- if (! -x $svn || ! -x $svnadmin || ! mkdir($dir)) {
+ if (! -x $svn || ! -x $svnadmin) {
eval q{
- use Test::More skip_all => "svn not available or could not make test dir"
+ use Test::More skip_all => "svn or svnadmin not available"
}
}
+ if (! mkdir($dir)) {
+ die $@;
+ }
}
use Test::More tests => 12;