X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/afedd60d7911b35aa3fb86dad24d61809946b9ed..65d9871a380be4b6622e64de62b7ba4f5f78fb94:/IkiWiki/Rcs/git.pm diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 271c27af6..949bbde0a 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,7 @@ sub rcs_recentchanges ($) { #{{{ my ($num) = @_; - eval q{use CGI 'escapeHTML'}; eval q{use Date::Parse}; - eval q{use Time::Duration}; my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets); INFO: foreach my $ci (git_commit_info('HEAD', $num)) { @@ -356,7 +354,7 @@ 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'} }) { my $diffurl = $config{'diffurl'}; @@ -368,12 +366,12 @@ sub rcs_recentchanges ($) { #{{{ $diffurl =~ s/\[\[sha1_to\]\]/$bit->{'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 +384,7 @@ sub rcs_recentchanges ($) { #{{{ push @rets, { rev => $sha1, - user => htmllink("", "", $user, 1), + user => $user, committype => $type, when => $when, message => [@message],