Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 88100af0fdf42a89a9048ead3448a424ee6267ef..2b2f43b7ae19fa89a2facf4ba02aca4b66ed671a 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -16,6 +16,8 @@ sub import {
        hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi);
        # Load goto to fix up links from recentchanges
        IkiWiki::loadplugin("goto");
        hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi);
        # Load goto to fix up links from recentchanges
        IkiWiki::loadplugin("goto");

+       # ... and transient as somewhere to put our internal pages
+       IkiWiki::loadplugin("transient");

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -56,7 +58,7 @@ sub refresh ($) {
        # delete old and excess changes
        foreach my $page (keys %pagesources) {
                if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {
        # delete old and excess changes
        foreach my $page (keys %pagesources) {
                if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {

-                       unlink($config{srcdir}.'/'.$pagesources{$page});
+                       unlink($IkiWiki::Plugin::transient::transientdir.'/'.$pagesources{$page}) || unlink($config{srcdir}.'/'.$pagesources{$page});

                }
        }
 }
                }
        }
 }


@@ -84,12 +86,14 @@ sub sessioncgi ($$) {
                method => 'POST',
                javascript => 0,
                params => $q,
                method => 'POST',
                javascript => 0,
                params => $q,

-               action => $config{cgiurl},
+               action => IkiWiki::cgiurl(),

                stylesheet => 1,
                template => { template('revert.tmpl') },
                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",


@@ -98,36 +102,34 @@ sub sessioncgi ($$) {
        IkiWiki::decode_form_utf8($form);
 
        if ($form->submitted eq 'Revert' && $form->validate) {
        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::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,
-                       );
+               IkiWiki::checksessionexpiry($q, $session);
+               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));

-               $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev)));
+               $form->tmpl_param(diff => encode_entities(scalar IkiWiki::rcs_diff($rev, 200)));

                $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
                IkiWiki::showform($form, $buttons, $session, $q);
                exit 0;
        }
 
                $form->field(name => "rev", type => "hidden", value => $rev, force => 1);
                IkiWiki::showform($form, $buttons, $session, $q);
                exit 0;
        }
 

-       IkiWiki::redirect($q, urlto($config{recentchangespage}, ''));
+       IkiWiki::redirect($q, urlto($config{recentchangespage}));

        exit 0;
 }
 
        exit 0;
 }
 


@@ -163,6 +165,7 @@ sub store ($$$) {
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;

+       my $has_diffurl=0;

        $change->{pages} = [
                map {
                        if (length $config{cgiurl}) {
        $change->{pages} = [
                map {
                        if (length $config{cgiurl}) {


@@ -178,7 +181,9 @@ sub store ($$$) {
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }

-                       $_->{baseurl}="$config{url}/" if length $config{url};
+                       if (defined $_->{diffurl} && length($_->{diffurl})) {
+                               $has_diffurl=1;
+                       }

 
                        $_;
                } @{$change->{pages}}
 
                        $_;
                } @{$change->{pages}}


@@ -226,7 +231,9 @@ sub store ($$$) {
                wikiname => $config{wikiname},
        );
        
                wikiname => $config{wikiname},
        );
        

-       $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+       $template->param(has_diffurl => 1) if $has_diffurl;
+
+       $template->param(permalink => urlto($config{recentchangespage})."#change-".titlepage($change->{rev}))

                if exists $config{url};
        
        IkiWiki::run_hooks(pagetemplate => sub {
                if exists $config{url};
        
        IkiWiki::run_hooks(pagetemplate => sub {


@@ -235,8 +242,8 @@ sub store ($$$) {
        });
 
        my $file=$page."._change";
        });
 
        my $file=$page."._change";

-       writefile($file, $config{srcdir}, $template->output);
-       utime $change->{when}, $change->{when}, "$config{srcdir}/$file";
+       writefile($file, $IkiWiki::Plugin::transient::transientdir, $template->output);
+       utime $change->{when}, $change->{when}, $IkiWiki::Plugin::transient::transientdir.'/'.$file;

 
        return $page;
 }
 
        return $page;
 }