Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index ecc561bde86691489ab726eec677741f7fb6691f..e7fed9ad8ce9c838da52039e6a117b5b4f6c2c73 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 

-package IkiWiki;
-

 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");


@@ -132,7 +132,7 @@ sub rcs_recentchanges ($) {
                }
 
                my @message;
                }
 
                my @message;

-               push @message, { line => escapeHTML($summ) };
+               push @message, { line => $summ };

 
                my @pages;
 
 
                my @pages;
 


@@ -160,6 +160,20 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
        return @ret;
 }
 

+sub rcs_diff ($) { #{{{
+       my $rev=shift;
+       my $logs = `tla logs -d $config{srcdir}`;
+       my @changesets = reverse split(/\n/, $logs);
+       my $i;
+
+       for($i=0;$i<$#changesets;$i++) {
+               last if $changesets[$i] eq $rev;
+       }
+
+       my $revminusone = $changesets[$i+1];
+       return `tla diff -d $config{srcdir} $revminusone`;
+} #}}}
+

 sub rcs_getctime ($) { #{{{
        my $file=shift;
        eval q{use Date::Parse};
 sub rcs_getctime ($) { #{{{
        my $file=shift;
        eval q{use Date::Parse};