aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-08 18:59:04 -0400
committerJoey Hess <joey@kitenet.net>2010-10-08 18:59:04 -0400
commitfb4ee927a0ee3d959b2e910928d24facb1fd8068 (patch)
tree5aecdc77d35f3016ff544f1278da6b38d2f11c49
parent4efc1f22d428ebfdc1c0ef5b4c6375cf3287526b (diff)
downloadikiwiki-fb4ee927a0ee3d959b2e910928d24facb1fd8068.tar
ikiwiki-fb4ee927a0ee3d959b2e910928d24facb1fd8068.tar.gz
propigate rcs_revert error message
and misc reorg
-rw-r--r--IkiWiki/Plugin/recentchanges.pm25
1 files changed, 9 insertions, 16 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 88100af0f..b7c014e90 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -99,25 +99,18 @@ sub sessioncgi ($$) {
if ($form->submitted eq 'Revert' && $form->validate) {
IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
- IkiWiki::disable_commit_hook();
my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
- if (! defined $r) { # success
- rcs_commit_staged(
- message => sprintf(gettext("This reverts commit %s"), $rev),
- session => $session,
- rev => $rev,
- );
- }
+ error $r if defined $r;
+ IkiWiki::disable_commit_hook();
+ rcs_commit_staged(
+ message => sprintf(gettext("This reverts commit %s"), $rev),
+ session => $session,
+ );
IkiWiki::enable_commit_hook();
- if (defined $r) {
- die "Revert '$rev' failed.";
- }
- else {
- require IkiWiki::Render;
- IkiWiki::refresh();
- IkiWiki::saveindex();
- }
+ require IkiWiki::Render;
+ IkiWiki::refresh();
+ IkiWiki::saveindex();
}
elsif ($form->submitted ne 'Cancel') {
$form->title(sprintf(gettext("confirm reversion of %s"), $rev));