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

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 38e0d4422bc0506ec2249273299313e672777a70..671438710e4444de5dd2f1aacef7183659ccadb1 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,7 +38,7 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
        my $this=shift;
 
 sub import (@) {
        my $this=shift;

-       $config{setuptype}='Standard';
+       $config{setuptype}='Yaml';

        IkiWiki::Setup::merge({@_});
 
        if (! $config{force_overwrite}) {
        IkiWiki::Setup::merge({@_});
 
        if (! $config{force_overwrite}) {


@@ -72,9 +72,15 @@ sub import (@) {
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO

+                       print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n";

                }
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO
                }
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO

+                       print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
+               }
+               elsif ($config{rcs} eq 'tla') {
+                       # TODO
+                       print STDERR "warning: do not know how to set up the tla_wrapper hook!\n";

                }
                elsif ($config{rcs} eq 'cvs') {
                        $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
                }
                elsif ($config{rcs} eq 'cvs') {
                        $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";