web commit by FaidonLiambotis: Revise the locale patch

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index be4106a02d143704f1e9bf2496e1e0b56dcf43b2..b5f5fb445832d65e4115831fc885823ceb687a5d 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -7,7 +7,7 @@ use IkiWiki;
 
 package 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;
 
 sub svn_info ($$) { #{{{
        my $field=shift;


@@ -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' },


@@ -130,8 +143,8 @@ sub rcs_recentchanges ($) { #{{{
                my $committype="web";
                if (defined $message[0] &&
                    $message[0]->{line}=~/$svn_webcommit/) {
                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";
                }
                else {
                        $committype="svn";


@@ -172,8 +185,8 @@ sub rcs_notify () { #{{{
        chomp $user;
        my $message=`svnlook log $config{svnrepo} -r $rev`;
        if ($message=~/$svn_webcommit/) {
        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;
        }
 
        my @changed_pages;