* Add exclude option in setup files, works same as --exclude.

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 56bf17e2c1042ae367c1cd9afa63012ff33723ab..289b48b87c56fc314fba6ed1c85a7f3424eee0a9 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,7 +34,8 @@ sub preprocess (@) { #{{{
 
        $tags{$page} = [];
        foreach my $tag (keys %params) {
-               if (exists $IkiWiki::config{tagbase}) {
+               if (exists $IkiWiki::config{tagbase} &&
+                   defined $IkiWiki::config{tagbase}) {
                        $tag=$IkiWiki::config{tagbase}."/".$tag;
                }
                push @{$tags{$page}}, $tag;

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4082ca7af664e0662325c6bb0f408372789e35f4..b1418ae34743272c583e35cdbe915026a236c258 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,6 +30,9 @@ sub setup_standard {
                }
                delete $setup{disable_plugins};
        }
+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       }
 
        debug("generating wrappers..");
        my @wrappers=@{$setup{wrappers}};

diff --git a/debian/changelog b/debian/changelog
index 1f4cabf2dc4562bb3d6c5023bea38d1dac16aa33..2edb343e3cc95cdbaf2c75019d26d76e3eddfce6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ikiwiki (1.12) UNRELEASED; urgency=low
 
   * Add getopt hook type, this allows plugins to add new command-line options.
   * Add --tagbase option to tag plugin.
+  * Add exclude option in setup files, works same as --exclude.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 28 Jul 2006 01:17:48 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 28 Jul 2006 13:47:34 -0400
 
 ikiwiki (1.11) unstable; urgency=low
 

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index b79722db9be79295189667557cc04bc3f28f05a0..8c9ce063c8182a7126e0d1f16179328d2b24d364 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -67,6 +67,9 @@ use IkiWiki::Setup::Standard {
        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
        discussion => 1,
+       # To exclude files matching a regexp from processing. This adds to
+       # the default exclude list.
+       #exclude => qr/\*.wav/,
        # Time format (for strftime)
        #timeformat => '%c',
        

diff --git a/t/crazy-badass-perl-bug.t b/t/crazy-badass-perl-bug.t
index f54f27c4bcaec16cbd341a12cc8abea877a32005..047ff1db2499305aa906f14de30b5c896d569ef8 100755 (executable)
--- a/t/crazy-badass-perl-bug.t
+++ b/t/crazy-badass-perl-bug.t
@@ -13,7 +13,7 @@ BEGIN { use_ok("IkiWiki::Render"); }
 # Initialize htmlscrubber plugin
 %IkiWiki::config=IkiWiki::defaultconfig();
 $IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null";
-IkiWiki::checkconfig();
+IkiWiki::loadplugins(); IkiWiki::checkconfig();
 ok(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test1.mdwn")));
 ok(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test3.mdwn")),
        "wtf?") for 1..100;

diff --git a/t/htmlize.t b/t/htmlize.t
index 687eb03a8b104a67b848e12c9ccc57beb81e9643..070fbf9584740a1f5b65e37c40e0a79c9bb5ad69 100755 (executable)
--- a/t/htmlize.t
+++ b/t/htmlize.t
@@ -10,6 +10,7 @@ BEGIN { use_ok("IkiWiki::Render"); }
 # Initialize htmlscrubber plugin
 %IkiWiki::config=IkiWiki::defaultconfig();
 $IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null";
+IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
 is(IkiWiki::htmlize("mdwn", "foo\n\nbar\n"), "<p>foo</p>\n\n<p>bar</p>\n",