update info on my split-view setup, and ask for plugin advice

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

diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index e3ba9b8d8248858689619fee48a963912c593648..41882279331f8b1a2171bb98197602197ba64190 100644 (file)
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -28,17 +28,24 @@ sub pagetemplate (@) {
        my $template=$params{template};
        if ($config{rcs} && exists $params{rev} && length $params{rev} &&
            $template->query(name => "diff")) {
        my $template=$params{template};
        if ($config{rcs} && exists $params{rev} && length $params{rev} &&
            $template->query(name => "diff")) {

-               my @lines=IkiWiki::rcs_diff($params{rev});
+               my @lines=IkiWiki::rcs_diff($params{rev}, $maxlines+1);

                if (@lines) {
                        my $diff;
                if (@lines) {
                        my $diff;

+                       my $trunc=0;

                        if (@lines > $maxlines) {
                        if (@lines > $maxlines) {

-                               # only include so many lines of diff
-                               $diff=join("", @lines[0..($maxlines-1)])."\n".
-                                       gettext("(Diff truncated)");
+                               $diff=join("", @lines[0..($maxlines-1)]);
+                               $trunc=1;

                        }
                        else {
                                $diff=join("", @lines);
                        }
                        }
                        else {
                                $diff=join("", @lines);
                        }

+                       if (length $diff > 102400) {
+                               $diff=substr($diff, 0, 10240);
+                               $trunc=1;
+                       }
+                       if ($trunc) {
+                               $diff.="\n".gettext("(Diff truncated)");
+                       }

                        # escape html
                        $diff = encode_entities($diff);
                        # escape links and preprocessor stuff
                        # escape html
                        $diff = encode_entities($diff);
                        # escape links and preprocessor stuff