response

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 560eb38a326941a642a40bf1019cce10aa469823..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;
@@ -131,10 +153,7 @@ 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) };
@@ -143,8 +162,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";
@@ -185,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;