web commit by joey

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 199a02ee1ec4e3b1e3aec0ff2b8ffaa100a29088..560eb38a326941a642a40bf1019cce10aa469823 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -104,10 +104,23 @@ sub rcs_recentchanges ($) { #{{{
        eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
        eval q{use Time::Duration};
        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};
        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 $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' },
                ForceArray => [ 'logentry', 'path' ],
                GroupTags => { paths => 'path' },
                KeyAttr => { path => 'content' },


@@ -126,7 +139,6 @@ sub rcs_recentchanges ($) { #{{{
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
                        push @message, { line => escapeHTML($msgline) };
                }
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
                        push @message, { line => escapeHTML($msgline) };
                }

-               unshift @message, { line => "\n" } if @message > 1;

 
                my $committype="web";
                if (defined $message[0] &&
 
                my $committype="web";
                if (defined $message[0] &&