Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index e7b22f3c5c5ffb24e8c1379b4dc4399cfaf2e6f8..101e91b930836126f9ef4a00b6a722af42cf5c50 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -8,9 +8,6 @@ use Encode;
 use open qw{:utf8 :std};
 
 sub import { #{{{
 use open qw{:utf8 :std};
 
 sub import { #{{{

-       if (exists $IkiWiki::hooks{rcs}) {
-               error(gettext("cannot use multiple rcs plugins"));
-       }

        hook(type => "checkconfig", id => "bzr", call => \&checkconfig);
        hook(type => "getsetup", id => "bzr", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
        hook(type => "checkconfig", id => "bzr", call => \&checkconfig);
        hook(type => "getsetup", id => "bzr", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);


@@ -36,10 +33,14 @@ sub checkconfig () { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 0, # rcs plugin
+                       rebuild => undef,
+               },

                bzr_wrapper => {
                        type => "string",
                        #example => "", # FIXME add example
                bzr_wrapper => {
                        type => "string",
                        #example => "", # FIXME add example

-                       description => "bzr post-commit executable to generate",
+                       description => "bzr post-commit hook to generate",

                        safe => 0, # file
                        rebuild => 0,
                },
                        safe => 0, # file
                        rebuild => 0,
                },