fix typo

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index b5f5fb445832d65e4115831fc885823ceb687a5d..f3e353cbe68b9d74af6c2798f7efd2ec43144117 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -1,14 +1,35 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# For subversion support.

 
 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;


@@ -101,7 +122,6 @@ sub rcs_recentchanges ($) { #{{{
        
        return unless -d "$config{srcdir}/.svn";
 
        
        return unless -d "$config{srcdir}/.svn";
 

-       eval q{use CGI 'escapeHTML'};

        eval q{use Date::Parse};
        eval q{use Time::Duration};
        eval q{use XML::SAX};
        eval q{use Date::Parse};
        eval q{use Time::Duration};
        eval q{use XML::SAX};


@@ -131,13 +151,10 @@ 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})) {
 
                foreach my $msgline (split(/\n/, $logentry->{msg})) {

-                       push @message, { line => escapeHTML($msgline) };
+                       push @message, { line => $msgline };

                }
 
                my $committype="web";
                }
 
                my $committype="web";


@@ -158,12 +175,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],


@@ -237,7 +254,6 @@ sub rcs_notify () { #{{{
 
 sub rcs_getctime ($) { #{{{
        my $file=shift;
 
 sub rcs_getctime ($) { #{{{
        my $file=shift;

-       eval q{use Date::Parse};

 
        my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
                
 
        my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
                


@@ -259,6 +275,7 @@ sub rcs_getctime ($) { #{{{
                return 0;
        }
                
                return 0;
        }
                

+       eval q{use Date::Parse};

        $date=str2time($date);
        debug("found ctime ".localtime($date)." for $file");
        return $date;
        $date=str2time($date);
        debug("found ctime ".localtime($date)." for $file");
        return $date;