more destpage improvements

[ikiwiki.git] / IkiWiki / Rcs / svn.pm

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 5474e3be2537a311896e10c71613fa19da243031..b5f5fb445832d65e4115831fc885823ceb687a5d 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -7,7 +7,7 @@ use IkiWiki;
 
 package IkiWiki;
                
-my $svn_webcommit=qr/^web commit by (\w+):?(.*)/;
+my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
 
 sub svn_info ($$) { #{{{
        my $field=shift;
@@ -64,7 +64,8 @@ sub rcs_commit ($$$) { #{{{
                        }
                }
 
-               if (system("svn", "commit", "--quiet", "-m",
+               if (system("svn", "commit", "--quiet", 
+                          "--encoding", "UTF-8", "-m",
                           possibly_foolish_untaint($message),
                           "$config{srcdir}") != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
@@ -103,10 +104,23 @@ sub rcs_recentchanges ($) { #{{{
        eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
        eval q{use Time::Duration};
+       eval q{use XML::SAX};
        eval q{use XML::Simple};
-       
+
+       # avoid using XML::SAX::PurePerl, it's buggy with UTF-8 data
+       my @parsers = map { ${$_}{Name} } @{XML::SAX->parsers()};
+       do {
+               $XML::Simple::PREFERRED_PARSER = pop @parsers;
+       } until $XML::Simple::PREFERRED_PARSER ne 'XML::SAX::PurePerl';
+
+       # --limit is only supported on Subversion 1.2.0+
+       my $svn_version=`svn --version -q`;
+       my $svn_limit='';
+       $svn_limit="--limit $num"
+               if $svn_version =~ /\d\.(\d)\.\d/ && $1 >= 2;
+
        my $svn_url=svn_info("URL", $config{srcdir});
-       my $xml = XMLin(scalar `svn --xml -v log '$svn_url'`,
+       my $xml = XMLin(scalar `svn $svn_limit --xml -v log '$svn_url'`,
                ForceArray => [ 'logentry', 'path' ],
                GroupTags => { paths => 'path' },
                KeyAttr => { path => 'content' },
@@ -129,8 +143,8 @@ sub rcs_recentchanges ($) { #{{{
                my $committype="web";
                if (defined $message[0] &&
                    $message[0]->{line}=~/$svn_webcommit/) {
-                       $user="$1";
-                       $message[0]->{line}=$2;
+                       $user=defined $2 ? "$2" : "$3";
+                       $message[0]->{line}=$4;
                }
                else {
                        $committype="svn";
@@ -171,8 +185,8 @@ sub rcs_notify () { #{{{
        chomp $user;
        my $message=`svnlook log $config{svnrepo} -r $rev`;
        if ($message=~/$svn_webcommit/) {
-               $user="$1";
-               $message=$2;
+               $user=defined $2 ? "$2" : "$3";
+               $message=$4;
        }
 
        my @changed_pages;
@@ -201,9 +215,7 @@ sub rcs_notify () { #{{{
                }
                $subject.=" by $user";
 
-               my $template=HTML::Template->new(
-                       filename => "$config{templatedir}/notifymail.tmpl"
-               );
+               my $template=template("notifymail.tmpl");
                $template->param(
                        wikiname => $config{wikiname},
                        diff => $diff,