* Simplify the data structure returned by rcs_recentchanges to avoid

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index b5f5fb445832d65e4115831fc885823ceb687a5d..9345b7fd29f357daaf75299f7fa5c3e55f25b778 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -4,11 +4,33 @@
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

+use POSIX qw(setlocale LC_CTYPE);

 
 package IkiWiki;
                
 my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
 
 
 package IkiWiki;
                
 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;
        my $file=shift;
 sub svn_info ($$) { #{{{
        my $field=shift;
        my $file=shift;


@@ -131,10 +153,7 @@ sub rcs_recentchanges ($) { #{{{
                my $rev = $logentry->{revision};
                my $user = $logentry->{author};
 
                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=time - str2time($logentry->{date}, 'UTC');

 
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
                        push @message, { line => escapeHTML($msgline) };
 
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
                        push @message, { line => escapeHTML($msgline) };


@@ -158,12 +177,12 @@ sub rcs_recentchanges ($) { #{{{
                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;
                        push @pages, {
                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;
                        push @pages, {

-                               link => htmllink("", "", pagename($file), 1),
+                               page => pagename($file),

                                diffurl => $diffurl,
                        } if length $file;
                }
                push @ret, { rev => $rev,
                                diffurl => $diffurl,
                        } if length $file;
                }
                push @ret, { rev => $rev,

-                       user => htmllink("", "", $user, 1),
+                       user => $user,

                        committype => $committype,
                        when => $when,
                        message => [@message],
                        committype => $committype,
                        when => $when,
                        message => [@message],