add news item for ikiwiki 3.20101129

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 2a78566e146f2e4b0bc2f321bd1fb0392e126dd5..562f61d40f3cc4729f5da0f01e3d6b2c4a20660d 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -13,6 +13,7 @@ sub import {
        hook(type => "refresh", id => "recentchanges", call => \&refresh);
        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "htmlize", id => "_change", call => \&htmlize);
+       hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi);
        # Load goto to fix up links from recentchanges
        IkiWiki::loadplugin("goto");
 }
@@ -60,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(
+       eval q{use CGI::FormBuilder};
+       error($@) if $@;
+       my $form = CGI::FormBuilder->new(
                name => "revert",
                header => 0,
                charset => "utf-8",
@@ -74,56 +86,49 @@ sub confirmation_form {
                params => $q,
                action => $config{cgiurl},
                stylesheet => 1,
-                template => { template('revert.tmpl') },
+               template => { template('revert.tmpl') },
+               fields => [qw{revertmessage do sid rev}],
        );
+       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",
+               force => 1);
+
+       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();
+               IkiWiki::rcs_commit_staged(
+                       message => $message,
+                       session => $session,
+               );
+               IkiWiki::enable_commit_hook();
+       
+               require IkiWiki::Render;
+               IkiWiki::refresh();
+               IkiWiki::saveindex();
+       }
+       elsif ($form->submitted ne 'Cancel') {
+               $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
+               $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;
+       }
 
-    $f->field(name => "sid", type => "hidden", value => $session->id,
-              force => 1);
-    $f->field(name => "do", type => "hidden", value => "revert", force => 1);
-    $f->field(name => "rev", type => "hidden", value => $rev, 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;
-
-    # FIXME rcs_preprevert ??
-    IkiWiki::check_canedit('FIXME', $q, $session);
-
-    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'));
-
-        IkiWiki::disable_commit_hook();
-        my $r = IkiWiki::rcs_revert(
-                         session => $session,
-                         rev => $rev);
-        IkiWiki::enable_commit_hook();
-
-        if($r) {
-            die "FIXME revert '$rev' failed.";
-        } else {
-            IkiWiki::refresh();
-            IkiWiki::saveindex();
-            # FIXME indicate success.
-        }
-    } else {
-        $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
-        my $patch_contents = IkiWiki::rcs_showpatch($rev);
-        $form->tmpl_param(patch_contents => encode_entities($patch_contents));
-        IkiWiki::showform($form, $buttons, $session, $q);
-        exit 0;
-    }
-
-    IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
-    exit 0;
+       IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
+       exit 0;
 }
 
 # Enable the recentchanges link.
@@ -179,6 +184,15 @@ sub store ($$$) {
                } @{$change->{pages}}
        ];
        push @{$change->{pages}}, { link => '...' } if $is_excess;
+       
+       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}
+               );
+       }
 
        $change->{author}=$change->{user};
        my $oiduser=eval { IkiWiki::openiduser($change->{user}) };