X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b6075d61632adb1ec43fb5572db0521bbac9d1ac..7fc96e5a2a4ee1301a7ca4636479261d707c84c8:/IkiWiki/Rcs/git.pm diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index dc8b6b9fe..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, @_) } #}}} @@ -344,6 +344,7 @@ sub rcs_recentchanges ($) { #{{{ my ($num) = @_; eval q{use Date::Parse}; + error($@) if $@; my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets); INFO: foreach my $ci (git_commit_info('HEAD', $num)) { @@ -356,19 +357,19 @@ sub rcs_recentchanges ($) { #{{{ $type = "web"; $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, { page => pagename($file), diffurl => $diffurl, - }, + }; } push @message, { line => $title }; @@ -458,6 +459,7 @@ sub rcs_notify () { #{{{ ); eval q{use Mail::Sendmail}; + error($@) if $@; foreach my $email (@email_recipients) { sendmail( To => $email,