response

[git.ikiwiki.info.git] / IkiWiki / Plugin / recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 88100af0fdf42a89a9048ead3448a424ee6267ef..562f61d40f3cc4729f5da0f01e3d6b2c4a20660d 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -87,9 +87,11 @@ sub sessioncgi ($$) {
                action => $config{cgiurl},
                stylesheet => 1,
                template => { template('revert.tmpl') },
                action => $config{cgiurl},
                stylesheet => 1,
                template => { template('revert.tmpl') },

+               fields => [qw{revertmessage do sid rev}],

        );
        my $buttons=["Revert", "Cancel"];
 
        );
        my $buttons=["Revert", "Cancel"];
 

+       $form->field(name => "revertmessage", type => "text", size => 80);

        $form->field(name => "sid", type => "hidden", value => $session->id,
                force => 1);
        $form->field(name => "do", type => "hidden", value => "revert",
        $form->field(name => "sid", type => "hidden", value => $session->id,
                force => 1);
        $form->field(name => "do", type => "hidden", value => "revert",


@@ -99,25 +101,23 @@ sub sessioncgi ($$) {
 
        if ($form->submitted eq 'Revert' && $form->validate) {
                IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
 
        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,
-                       );
+               my $message=sprintf(gettext("This reverts commit %s"), $rev);
+               if (defined $form->field('revertmessage') &&
+                   length $form->field('revertmessage')) {
+                       $message=$form->field('revertmessage')."\n\n".$message;

                }
                }

+               my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
+               error $r if defined $r;
+               IkiWiki::disable_commit_hook();
+               IkiWiki::rcs_commit_staged(
+                       message => $message,
+                       session => $session,
+               );

                IkiWiki::enable_commit_hook();
        
                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));
        }
        elsif ($form->submitted ne 'Cancel') {
                $form->title(sprintf(gettext("confirm reversion of %s"), $rev));