Making use of the transient plugin

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 6fcd8c2ca660747eb62a626e22f63339687b06e7..185026d202a151bd9b210964491c60b69d6988df 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -32,6 +32,8 @@ sub import {
        hook(type => "needsbuild", id => "calendar", call => \&needsbuild);
        hook(type => "preprocess", id => "calendar", call => \&preprocess);
        hook(type => "scan", id => "calendar", call => \&scan);
        hook(type => "needsbuild", id => "calendar", call => \&needsbuild);
        hook(type => "preprocess", id => "calendar", call => \&preprocess);
        hook(type => "scan", id => "calendar", call => \&scan);

+
+       IkiWiki::loadplugin("transient");

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


@@ -63,14 +65,6 @@ sub getsetup () {
                        safe => 1,
                        rebuild => undef,
                },
                        safe => 1,
                        rebuild => undef,
                },

-               calendar_autocreate_commit => {
-                       type => "boolean",
-                       example => 1,
-                       default => 1,
-                       description => "commit autocreated calendar pages",
-                       safe => 1,
-                       rebuild => 0,
-               },

                calendar_fill_gaps => {
                        type => "boolean",
                        example => 1,
                calendar_fill_gaps => {
                        type => "boolean",
                        example => 1,


@@ -83,10 +77,7 @@ sub getsetup () {
 
 sub checkconfig () {
        if (! defined $config{calendar_autocreate}) {
 
 sub checkconfig () {
        if (! defined $config{calendar_autocreate}) {

-               $config{calendar_autocreate} = defined $config{archivebase} || defined $config{calendar_autocreate_commit};
-       }
-       if (! defined $config{calendar_autocreate_commit}) {
-               $config{calendar_autocreate_commit} = 1;
+               $config{calendar_autocreate} = defined $config{archivebase};

        }
        if (! defined $config{archive_pagespec}) {
                $config{archive_pagespec} = '*';
        }
        if (! defined $config{archive_pagespec}) {
                $config{archive_pagespec} = '*';


@@ -128,18 +119,9 @@ sub autocreate {
        $template->param(month => $month) if defined $month;
        $template->param(pagespec => $config{archive_pagespec});
 
        $template->param(month => $month) if defined $month;
        $template->param(pagespec => $config{archive_pagespec});
 

-       my $dir = $config{srcdir};
-       if (! $config{calendar_autocreate_commit}) {
-               $dir = $IkiWiki::Plugin::transient::transientdir;
-       }
+       my $dir = $IkiWiki::Plugin::transient::transientdir;

 
        writefile($pagefile, $dir, $template->output);
 
        writefile($pagefile, $dir, $template->output);

-       if ($config{rcs} && $config{calendar_autocreate_commit}) {
-               IkiWiki::disable_commit_hook();
-               IkiWiki::rcs_add($pagefile);
-               IkiWiki::rcs_commit_staged(message => $message);
-               IkiWiki::enable_commit_hook();
-       }

 }
 
 sub calendarlink($;$) {
 }
 
 sub calendarlink($;$) {

diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index b7dd3b20615b6e046318cc14fd272de0ad543a31..fb3cfb130444a7fd56dfda7df541b707c2cb03e6 100644 (file)
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -15,10 +15,7 @@ pages from templates (overriding the existing ones).
 * `archive_pagespec` - [[ikiwiki/PageSpec]] of pages to include in the
   archives, if option `calendar_autocreate` is on. It defaults to `*`.
 * `calendar_autocreate` - Control whether new archive pages are created as
 * `archive_pagespec` - [[ikiwiki/PageSpec]] of pages to include in the
   archives, if option `calendar_autocreate` is on. It defaults to `*`.
 * `calendar_autocreate` - Control whether new archive pages are created as

-  needed. It defaults to being done only if (at least) one of options
-  `archivebase` and `calendar_autocreate_commit` are set.
-* `calendar_autocreate_commit` -  If set, causes new archive pages to be
-  checked into version control. Defaults to 1.
+  needed. It defaults to being done only if option `archivebase` is set.

 * `calendar_fill_gaps` - If set (and `calendar_autocreate` is set as well),
   build calendar pages of emty years and months (but does not build pages older
   than the older page, and younger than the younger page of the pagespec). If
 * `calendar_fill_gaps` - If set (and `calendar_autocreate` is set as well),
   build calendar pages of emty years and months (but does not build pages older
   than the older page, and younger than the younger page of the pagespec). If