monotone: When getting the log, tell monotone how many entries we want, rather than...

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index f31a8606bb4f664b6d626c345e668bf4e884dda3..3a8b267a393f5d69cdccc1577df795d2504ce73d 100644 (file)
--- 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/debian/changelog b/debian/changelog
index b43144b365b88beac3e254779564dfa40ecc7a68..8f5783208cd5c9a5cc785c31ffb09c88c7cd11cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
   * 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
 

diff --git a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
index 2167deac4d98034ee98810fb6b2f7bd4c42dcecd..aa13ec339e3953cfa295ede4bf038a95d30a051c 100644 (file)
--- a/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
+++ b/doc/bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
@@ -19,3 +19,6 @@ When using monotone as revision control system, a "mtn: operation canceled: Brok
                }
        }
        close MTNLOG || debug("mtn log exited $?");
+
+> Thanks for the patch, and for testing the monotone backend.
+> applied [[done]] --[[Joey]]