add message field to revert form

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index b7c014e90eb2c5e654cf6be59c5f03cf7111dd90..c57b6749a1823148b0c1b4c8fc71a8784320227c 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,11 +101,16 @@ 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'));

+               my $message=sprintf(gettext("This reverts commit %s"), $rev);
+               if (defined $form->field('revertmessage') &&
+                   length $form->field('revertmessage')) {
+                       $message=$form->field('revertmessage')."\n".$message;
+               }

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

-                       message => sprintf(gettext("This reverts commit %s"), $rev),
+                       message => $message,

                        session => $session,
                );
                IkiWiki::enable_commit_hook();
                        session => $session,
                );
                IkiWiki::enable_commit_hook();

diff --git a/templates/revert.tmpl b/templates/revert.tmpl
index 6289bea6baff0b5cf77a4b372586567aca305ae6..0de32811b7a88250e62b72b05eddf1e5d655467a 100644 (file)
--- a/templates/revert.tmpl
+++ b/templates/revert.tmpl
@@ -3,6 +3,8 @@
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-SID>
  <TMPL_VAR FIELD-REV>
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-SID>
  <TMPL_VAR FIELD-REV>

+<label for="revertmessage" class="block">Optional comment about this change:</label>
+ <TMPL_VAR FIELD-REVERTMESSAGE>

 </div>
 <div class="revert buttons">
 <TMPL_VAR form-submit>
 </div>
 <div class="revert buttons">
 <TMPL_VAR form-submit>