Merge remote branch 'smcv/ready/tag-test'

[git.ikiwiki.info.git] / IkiWiki / Plugin / bzr.pm

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 562d5d3893fcf5c2c0c6ba0b82e574c362f36891..3bc4ea8dd69b1d67329ec1db81bdd2e4ac9d19cf 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -271,8 +271,9 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
-sub rcs_diff ($) {
+sub rcs_diff ($;$) {
        my $taintedrev=shift;
+       my $maxlines=shift;
        my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
 
        my $prevspec = "before:" . $rev;
@@ -281,8 +282,11 @@ sub rcs_diff ($) {
                "--new", $config{srcdir},
                "-r", $prevspec . ".." . $revspec);
        open (my $out, "@cmdline |");
-
-       my @lines = <$out>;
+       my @lines;
+       while (my $line=<$out>) {
+               last if defined $maxlines && @lines == $maxlines;
+               push @lines, $line;
+       }
        if (wantarray) {
                return @lines;
        }