From 862ca19eb1aee87e4ac05e8a5a9b326dd32dfe5d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 12 Mar 2008 15:45:10 -0400
Subject: truncate recentchangesdiffs after 200 lines

This works around a perl crasher bug, and also avoids bloating pages
with enormous diffs.

rcs_recentchanges modified to return a list in an array context.
---
 IkiWiki/Rcs/Stub.pm |  3 ++-
 IkiWiki/Rcs/git.pm  | 16 +++++++++-------
 IkiWiki/Rcs/svn.pm  |  2 +-
 IkiWiki/Rcs/tla.pm  |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'IkiWiki/Rcs')

diff --git a/IkiWiki/Rcs/Stub.pm b/IkiWiki/Rcs/Stub.pm
index d94daf8bc..a460f29a2 100644
--- a/IkiWiki/Rcs/Stub.pm
+++ b/IkiWiki/Rcs/Stub.pm
@@ -60,7 +60,8 @@ sub rcs_recentchanges ($) {
 sub rcs_diff ($) {
 	# Optional, used to get diffs for recentchanges.
 	# The parameter is the rev from rcs_recentchanges.
-	return "";
+	# Should return a list of lines of the diff (including \n) in list
+	# context, and the whole diff in scalar context.
 }
 
 sub rcs_getctime ($) {
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 9306a513e..1882b43ef 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -414,16 +414,18 @@ sub rcs_recentchanges ($) { #{{{
 sub rcs_diff ($) { #{{{
 	my $rev=shift;
 	my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
-	my $ret;
+	my @lines;
 	foreach my $line (run_or_non("git", "show", $sha1)) {
-		if (defined $ret) {
-			$ret.=$line."\n";
-		}
-		elsif ($line=~/^diff --git/) {
-			$ret=$line."\n";
+		if (@lines || $line=~/^diff --git/) {
+			push @lines, $line."\n";
 		}
 	}
-	return $ret;
+	if (wantarray) {
+		return @lines;
+	}
+	else {
+		return join("", @lines);
+	}
 } #}}}
 
 sub rcs_getctime ($) { #{{{
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 7bad40747..ea193e08f 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -219,7 +219,7 @@ sub rcs_recentchanges ($) { #{{{
 
 sub rcs_diff ($) { #{{{
 	my $rev=possibly_foolish_untaint(int(shift));
-	return scalar `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
+	return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 } #}}}
 
 sub rcs_getctime ($) { #{{{
diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 2890ff8c7..47579c15b 100644
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -171,7 +171,7 @@ sub rcs_diff ($) { #{{{
 	}
 
 	my $revminusone = $changesets[$i+1];
-	return scalar `tla diff -d $config{srcdir} $revminusone`;
+	return `tla diff -d $config{srcdir} $revminusone`;
 } #}}}
 
 sub rcs_getctime ($) { #{{{
-- 
cgit v1.2.3