X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/92065444d982a443d3862f9ce5094bd32faffb85..e81c14a69f714c0670cd512d4fb4caac2ebcc3da:/IkiWiki/Rcs/svn.pm

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 9345b7fd2..71189c82e 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# For subversion support.
 
 use warnings;
 use strict;
@@ -8,8 +7,6 @@ use POSIX qw(setlocale LC_CTYPE);
 
 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());
@@ -123,11 +120,13 @@ sub rcs_recentchanges ($) { #{{{
 	
 	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 XML::Simple};
+	eval q{
+		use Date::Parse;
+		use Time::Duration;
+		use XML::SAX;
+		use XML::Simple;
+	};
+	error($@) if $@;
 
 	# avoid using XML::SAX::PurePerl, it's buggy with UTF-8 data
 	my @parsers = map { ${$_}{Name} } @{XML::SAX->parsers()};
@@ -156,12 +155,12 @@ sub rcs_recentchanges ($) { #{{{
 		my $when=time - str2time($logentry->{date}, 'UTC');
 
 		foreach my $msgline (split(/\n/, $logentry->{msg})) {
-			push @message, { line => escapeHTML($msgline) };
+			push @message, { line => $msgline };
 		}
 
 		my $committype="web";
 		if (defined $message[0] &&
-		    $message[0]->{line}=~/$svn_webcommit/) {
+		    $message[0]->{line}=~/$config{web_commit_regexp}/) {
 			$user=defined $2 ? "$2" : "$3";
 			$message[0]->{line}=$4;
 		}
@@ -203,7 +202,7 @@ sub rcs_notify () { #{{{
 	my $user=`svnlook author $config{svnrepo} -r $rev`;
 	chomp $user;
 	my $message=`svnlook log $config{svnrepo} -r $rev`;
-	if ($message=~/$svn_webcommit/) {
+	if ($message=~/$config{web_commit_regexp}/) {
 		$user=defined $2 ? "$2" : "$3";
 		$message=$4;
 	}
@@ -243,6 +242,7 @@ sub rcs_notify () { #{{{
 		);
 		
 		eval q{use Mail::Sendmail};
+		error($@) if $@;
 		foreach my $email (@email_recipients) {
 			sendmail(
 				To => $email,
@@ -256,7 +256,6 @@ sub rcs_notify () { #{{{
 
 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+).*/;
 		
@@ -278,6 +277,8 @@ sub rcs_getctime ($) { #{{{
 		return 0;
 	}
 		
+	eval q{use Date::Parse};
+	error($@) if $@;
 	$date=str2time($date);
 	debug("found ctime ".localtime($date)." for $file");
 	return $date;