X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/afedd60d7911b35aa3fb86dad24d61809946b9ed..ad01bcd8b49deed11f602c43d1da8235280d5d6b:/IkiWiki/Rcs/git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 271c27af6..c8b5adc45 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -48,7 +48,7 @@ sub _safe_git (&@) { #{{{
 	return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.
-sub run_or_die ($@) { _safe_git(\&IkiWiki::error, @_) }
+sub run_or_die ($@) { _safe_git(\&error, @_) }
 sub run_or_cry ($@) { _safe_git(sub { warn @_ },  @_) }
 sub run_or_non ($@) { _safe_git(undef,            @_) }
 #}}}
@@ -343,9 +343,8 @@ sub rcs_recentchanges ($) { #{{{
 
 	my ($num) = @_;
 
-	eval q{use CGI 'escapeHTML'};
 	eval q{use Date::Parse};
-	eval q{use Time::Duration};
+	error($@) if $@;
 
 	my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets);
 	INFO: foreach my $ci (git_commit_info('HEAD', $num)) {
@@ -356,24 +355,24 @@ sub rcs_recentchanges ($) { #{{{
 
 		$sha1 = $ci->{'sha1'};
 		$type = "web";
-		$when = concise(ago(time - $ci->{'author_epoch'}));
+		$when = time - $ci->{'author_epoch'};
 
-		foreach my $bit (@{ $ci->{'details'} }) {
+		DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
 			my $diffurl = $config{'diffurl'};
-			my $file    = $bit->{'file'};
+			my $file    = $detail->{'file'};
 
 			$diffurl =~ s/\[\[file\]\]/$file/go;
 			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
-			$diffurl =~ s/\[\[sha1_from\]\]/$bit->{'sha1_from'}/go;
-			$diffurl =~ s/\[\[sha1_to\]\]/$bit->{'sha1_to'}/go;
+			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
+			$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
 
 			push @pages, {
-				link => htmllink("", "", pagename($file), 1),
+				page => pagename($file),
 				diffurl => $diffurl,
-			},
+			};
 		}
 
-		push @message, { line => escapeHTML($title) };
+		push @message, { line => $title };
 
 		if (defined $message[0] &&
 		    $message[0]->{line} =~ m/$web_commit_msg/) {
@@ -386,7 +385,7 @@ sub rcs_recentchanges ($) { #{{{
 
 		push @rets, {
 			rev        => $sha1,
-			user       => htmllink("", "", $user, 1),
+			user       => $user,
 			committype => $type,
 			when       => $when,
 			message    => [@message],
@@ -460,6 +459,7 @@ sub rcs_notify () { #{{{
 	);
 
 	eval q{use Mail::Sendmail};
+	error($@) if $@;
 	foreach my $email (@email_recipients) {
 		sendmail(
 			To      => $email,