Merge branch 'master' into comments

master
Joey Hess 2008-12-17 14:06:57 -05:00
commit 613a54a3cb
6 changed files with 35 additions and 4 deletions

View File

@ -525,13 +525,12 @@ sub rcs_recentchanges ($) { #{{{
my $child = open(MTNLOG, "-|"); my $child = open(MTNLOG, "-|");
if (! $child) { if (! $child) {
exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph", exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph",
"--brief") || error("mtn log failed to run"); "--brief", "--last=$num") || error("mtn log failed to run");
} }
while (($num >= 0) and (my $line = <MTNLOG>)) { while (my $line = <MTNLOG>) {
if ($line =~ m/^($sha1_pattern)/) { if ($line =~ m/^($sha1_pattern)/) {
push @revs, $1; push @revs, $1;
$num -= 1;
} }
} }
close MTNLOG || debug("mtn log exited $?"); close MTNLOG || debug("mtn log exited $?");

View File

@ -111,7 +111,7 @@ sub rename_form ($$$) { #{{{
$f->field(name => "do", type => "hidden", value => "rename", force => 1); $f->field(name => "do", type => "hidden", value => "rename", force => 1);
$f->field(name => "page", type => "hidden", value => $page, force => 1); $f->field(name => "page", type => "hidden", value => $page, force => 1);
$f->field(name => "new_name", value => pagetitle($page), size => 60); $f->field(name => "new_name", value => pagetitle($page, 1), size => 60);
if (!$q->param("attachment")) { if (!$q->param("attachment")) {
# insert the standard extensions # insert the standard extensions
my @page_types; my @page_types;

3
debian/changelog vendored
View File

@ -16,6 +16,9 @@ ikiwiki (2.71) UNRELEASED; urgency=low
generated. generated.
* meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect. * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
* htmlbalance: don't compact whitespace, and set misc other options (smcv) * htmlbalance: don't compact whitespace, and set misc other options (smcv)
* rename: Fix double-escaping of page name in edit box.
* monotone: When getting the log, tell monotone how many entries
we want, rather than closing the pipe, which it dislikes. (thm)
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500 -- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500

View File

@ -0,0 +1,4 @@
Just as a point of information, I do not put my cgi wrapper in the dest
directory. Instead I configure Apache to relate a specific URI to the cgi via
ScriptAlias. I would not like things to be changed so that the cgi was put in
the destdir, so I'd vote instead to comment in the `setup\_file`. -- [[Jon]]

View File

@ -0,0 +1,24 @@
When using monotone as revision control system, a "mtn: operation canceled: Broken pipe" message is printed. Reason is that, in a call to mtn, the pipe is closed before mtn has done all its output. This patch fixes the problem.
diff -up ikiwiki/IkiWiki/Plugin/monotone.pm.orig ikiwiki/IkiWiki/Plugin/monotone.pm
--- ikiwiki/IkiWiki/Plugin/monotone.pm.orig 2008-11-12 23:45:24.000000000 +0100
+++ ikiwiki/IkiWiki/Plugin/monotone.pm 2008-12-16 12:41:38.000000000 +0100
@@ -525,13 +525,12 @@ sub rcs_recentchanges ($) { #{{{
my $child = open(MTNLOG, "-|");
if (! $child) {
exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph",
- "--brief") || error("mtn log failed to run");
+ "--brief", "--last=$num") || error("mtn log failed to run");
}
- while (($num >= 0) and (my $line = <MTNLOG>)) {
+ while (my $line = <MTNLOG>) {
if ($line =~ m/^($sha1_pattern)/) {
push @revs, $1;
- $num -= 1;
}
}
close MTNLOG || debug("mtn log exited $?");
> Thanks for the patch, and for testing the monotone backend.
> applied [[done]] --[[Joey]]

View File

@ -1,3 +1,4 @@
[[!meta title="Jon Dowland"]]
I'm looking at ikiwiki both for my personal site but also as a I'm looking at ikiwiki both for my personal site but also as a
team-documentation management system for a small-sized group of UNIX team-documentation management system for a small-sized group of UNIX
sysadmins. sysadmins.