diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2008-12-17 14:06:57 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2008-12-17 14:06:57 -0500 |
| commit | 613a54a3cb48ff0bd00c02d44304ce08b6725343 (patch) | |
| tree | d0906f3c121113ded0c5dcb0215d3d9925a7c773 /IkiWiki | |
| parent | 15ec55eff58d056704b7911d8ed3975a4f09d65c (diff) | |
| parent | f9b87a9f8b498f3a41614b159dcb278024be70dd (diff) | |
Merge branch 'master' into comments
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/monotone.pm | 5 | ||||
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index f31a8606b..3a8b267a3 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -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 $?"); diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 7e55e271c..e4201cc94 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -111,7 +111,7 @@ sub rename_form ($$$) { #{{{ $f->field(name => "do", type => "hidden", value => "rename", 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")) { # insert the standard extensions my @page_types; |