Fix escaping of filenames in historyurl. (Thanks, aj)

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 7e71d4fc3783740a4c1d76fb7966924097021333..562f61d40f3cc4729f5da0f01e3d6b2c4a20660d 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -61,12 +61,23 @@ sub refresh ($) {
        }
 }
 
-sub confirmation_form {
-       my ($q, $session, $rev) = @_;
+sub sessioncgi ($$) {
+       my ($q, $session) = @_;
+       my $do = $q->param('do');
+       my $rev = $q->param('rev');
+
+       return unless $do eq 'revert' && $rev;
+
+       my @changes=$IkiWiki::hooks{rcs}{rcs_preprevert}{call}->($rev);
+       IkiWiki::check_canchange(
+               cgi => $q,
+               session => $session,
+               changes => \@changes,
+       );
 
        eval q{use CGI::FormBuilder};
        error($@) if $@;
-       my $f = CGI::FormBuilder->new(
+       my $form = CGI::FormBuilder->new(
                name => "revert",
                header => 0,
                charset => "utf-8",
@@ -76,49 +87,41 @@ sub confirmation_form {
                action => $config{cgiurl},
                stylesheet => 1,
                template => { template('revert.tmpl') },
+               fields => [qw{revertmessage do sid rev}],
        );
+       my $buttons=["Revert", "Cancel"];
 
-       $f->field(name => "sid", type => "hidden", value => $session->id,
+       $form->field(name => "revertmessage", type => "text", size => 80);
+       $form->field(name => "sid", type => "hidden", value => $session->id,
                force => 1);
-       $f->field(name => "do", type => "hidden", value => "revert",
+       $form->field(name => "do", type => "hidden", value => "revert",
                force => 1);
 
-       return $f, ["Revert", "Cancel"];
-}
-
-sub sessioncgi ($$) {
-       my ($q, $session) = @_;
-       my $do = $q->param('do');
-       my $rev = $q->param('rev');
-
-       return unless $do eq 'revert' && $rev;
-
-       IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev);
-
-       my ($form, $buttons) = confirmation_form($q, $session);
        IkiWiki::decode_form_utf8($form);
 
        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\n".$message;
+               }
+               my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
+               error $r if defined $r;
                IkiWiki::disable_commit_hook();
-               my $r = IkiWiki::rcs_revert(
+               IkiWiki::rcs_commit_staged(
+                       message => $message,
                        session => $session,
-                       rev => $rev);
+               );
                IkiWiki::enable_commit_hook();
        
-               if ($r) {
-                       die "Revert '$rev' failed.";
-               }
-               else {
-                       require IkiWiki::Render;
-                       IkiWiki::refresh();
-                       IkiWiki::saveindex();
-               }
+               require IkiWiki::Render;
+               IkiWiki::refresh();
+               IkiWiki::saveindex();
        }
-       else {
+       elsif ($form->submitted ne 'Cancel') {
                $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
-               my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev);
-               $form->tmpl_param(patch_contents => encode_entities($patch_contents));
+               $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev)));
                $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
                IkiWiki::showform($form, $buttons, $session, $q);
                exit 0;
@@ -182,7 +185,9 @@ sub store ($$$) {
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
        
-       if (length $config{cgiurl}) {
+       if (length $config{cgiurl} &&
+           exists $IkiWiki::hooks{rcs}{rcs_preprevert} &&
+           exists $IkiWiki::hooks{rcs}{rcs_revert}) {
                $change->{reverturl} = IkiWiki::cgiurl(
                        do => "revert",
                        rev => $change->{rev}