From 2a60cda1729ead6dd2f13fc40ef1dccec5b30d92 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 25 Dec 2010 23:01:08 +0000
Subject: tag: optionally write autocreated tags to the transient underlay

For the moment, have the tag test keep the old behaviour.
---
 IkiWiki/Plugin/tag.pm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index fd5ce1e8a..e4c8a1155 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -12,6 +12,8 @@ sub import {
 	hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
 	hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
 	hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
+
+	IkiWiki::loadplugin("transient");
 }
 
 sub getopt () {
@@ -41,6 +43,14 @@ sub getsetup () {
 			safe => 1,
 			rebuild => undef,
 		},
+		tag_autocreate_commit => {
+			type => "boolean",
+			example => 1,
+			default => 1,
+			description => "commit autocreated tag pages",
+			safe => 1,
+			rebuild => 0,
+		},
 }
 
 sub taglink ($) {
@@ -97,8 +107,14 @@ sub gentag ($) {
 			my $template=template("autotag.tmpl");
 			$template->param(tagname => tagname($tag));
 			$template->param(tag => $tag);
-			writefile($tagfile, $config{srcdir}, $template->output);
-			if ($config{rcs}) {
+
+			my $dir = $config{srcdir};
+			if (! $config{tag_autocreate_commit}) {
+				$dir = $IkiWiki::Plugin::transient::transientdir;
+			}
+
+			writefile($tagfile, $dir, $template->output);
+			if ($config{rcs} && $config{tag_autocreate_commit}) {
 				IkiWiki::disable_commit_hook();
 				IkiWiki::rcs_add($tagfile);
 				IkiWiki::rcs_commit_staged(message => $message);
-- 
cgit v1.2.3


From 40f85e5c91c86a55661f68a5e9e38cc2c2a1e1be Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 26 Dec 2010 22:19:58 +0000
Subject: tag: default to tag_autocreate_commit=1 as intended

---
 IkiWiki/Plugin/tag.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index e4c8a1155..13dabce0c 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	hook(type => "checkconfig", id => "tag", call => \&checkconfig);
 	hook(type => "getopt", id => "tag", call => \&getopt);
 	hook(type => "getsetup", id => "tag", call => \&getsetup);
 	hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
@@ -53,6 +54,12 @@ sub getsetup () {
 		},
 }
 
+sub checkconfig () {
+	if (! defined $config{tag_autocreate_commit}) {
+		$config{tag_autocreate_commit} = 1;
+	}
+}
+
 sub taglink ($) {
 	my $tag=shift;
 	
-- 
cgit v1.2.3