remove some unimportant changelog entries to cut it down a bit..

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 199a02ee1ec4e3b1e3aec0ff2b8ffaa100a29088..2d203c7ca3001d7e6318dd254e0b3188287f0509 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -4,10 +4,32 @@
 use warnings;
 use strict;
 use IkiWiki;
+use POSIX qw(setlocale LC_CTYPE);
 
 package IkiWiki;
                
-my $svn_webcommit=qr/^web commit by (\w+):?(.*)/;
+my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
+
+# svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
+sub find_lc_ctype() {
+       my $current = setlocale(LC_CTYPE());
+       return $current if $current =~ m/UTF-?8$/i;
+
+       # Make some obvious attempts to avoid calling `locale -a`
+       foreach my $locale ("$current.UTF-8", "en_US.UTF-8", "en_GB.UTF-8") {
+               return $locale if setlocale(LC_CTYPE(), $locale);
+       }
+
+       # Try to get all available locales and pick the first UTF-8 one found.
+       if (my @locale = grep(/UTF-?8$/i, `locale -a`)) {
+               chomp @locale;
+               return $locale[0] if setlocale(LC_CTYPE(), $locale[0]);
+       }
+
+       # fallback to the current locale
+       return $current;
+} # }}}
+$ENV{LC_CTYPE} = $ENV{LC_CTYPE} || find_lc_ctype();
 
 sub svn_info ($$) { #{{{
        my $field=shift;
@@ -104,10 +126,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' },
@@ -118,21 +153,17 @@ sub rcs_recentchanges ($) { #{{{
                my $rev = $logentry->{revision};
                my $user = $logentry->{author};
 
-               my $date = $logentry->{date};
-               $date =~ s/T/ /;
-               $date =~ s/\.\d+Z$//;
-               my $when=concise(ago(time - str2time($date, 'UTC')));
+               my $when=concise(ago(time - str2time($logentry->{date}, 'UTC')));
 
                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] &&
                    $message[0]->{line}=~/$svn_webcommit/) {
-                       $user="$1";
-                       $message[0]->{line}=$2;
+                       $user=defined $2 ? "$2" : "$3";
+                       $message[0]->{line}=$4;
                }
                else {
                        $committype="svn";
@@ -173,8 +204,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;