403 response may be a "not found" too

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index f17868d736e421c2997e32feb8dfb1466cc920c5..1bebb1176d99569341a6735e83c4cb51c14e1ffc 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -42,16 +42,8 @@ sub handle_directive {
 }
 
 sub prefix_directives {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
+       loadsetup(shift);
 
-       require IkiWiki::Setup;
-       require IkiWiki::Plugin::aggregate;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::loadplugins();
        IkiWiki::checkconfig();
        IkiWiki::loadindex();
@@ -73,11 +65,7 @@ sub prefix_directives {
 }
 
 sub indexdb {
-       my $dir=shift;
-       if (! defined $dir) {
-               usage();                
-       }
-       $config{wikistatedir}=$dir."/.ikiwiki";
+       setstatedir(shift);
 
        # Note: No lockwiki here because ikiwiki already locks it
        # before calling this.  
@@ -96,11 +84,7 @@ sub indexdb {
 }
 
 sub hashpassword {
-       my $dir=shift;
-       if (! defined $dir) {
-               usage();                
-       }
-       $config{wikistatedir}=$dir."/.ikiwiki";
+       setstatedir(shift);
 
        eval q{use IkiWiki::UserInfo};
        eval q{use Authen::Passphrase::BlowfishCrypt};
@@ -122,31 +106,16 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
+       loadsetup(shift);
        require IkiWiki::Plugin::aggregate;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::checkconfig();
-
        IkiWiki::Plugin::aggregate::migrate_to_internal();
 }
 
 sub setupformat {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
 
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
        
        # unpack old-format wrappers setting into new fields
@@ -183,14 +152,8 @@ sub setupformat {
 
 sub moveprefs {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
 
-       require IkiWiki::Setup;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
 
        eval q{use IkiWiki::UserInfo};
@@ -221,11 +184,9 @@ sub moveprefs {
 }
 
 sub deduplinks {
-       my $dir=shift;
-       if (! defined $dir) {
-               usage();                
-       }
-       $config{wikistatedir}=$dir."/.ikiwiki";
+       loadsetup(shift);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();
        IkiWiki::loadindex();
        foreach my $page (keys %links) {
                my %l;
@@ -235,6 +196,40 @@ sub deduplinks {
        IkiWiki::saveindex();
 }
 
+sub setstatedir {
+       my $dirorsetup=shift;
+
+       if (! defined $dirorsetup) {
+               usage();                
+       }
+
+       if (-d $dirorsetup) {
+               $config{wikistatedir}=$dirorsetup."/.ikiwiki";
+       }
+       elsif (-f $dirorsetup) {
+               loadsetup($dirorsetup);
+       }
+       else {
+               error("ikiwiki-transition: $dirorsetup does not exist");
+       }
+
+       if (! -d $config{wikistatedir}) {
+               error("ikiwiki-transition: $config{wikistatedir} does not exist");
+       }
+}
+       
+sub loadsetup {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+}
+
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
@@ -242,9 +237,9 @@ sub usage {
        print STDERR "\taggregateinternal setupfile\n";
        print STDERR "\tsetupformat setupfile\n";
        print STDERR "\tmoveprefs setupfile\n";
-       print STDERR "\thashpassword srcdir\n";
-       print STDERR "\tindexdb srcdir\n";
-       print STDERR "\tdeduplinks srcdir\n";
+       print STDERR "\thashpassword setupfile|srcdir\n";
+       print STDERR "\tindexdb setupfile|srcdir\n";
+       print STDERR "\tdeduplinks setupfile\n";
        exit 1;
 }
 
@@ -304,7 +299,7 @@ sub oldloadindex {
                        $pagemtime{$page}=$items{mtime}[0];
                        $oldlinks{$page}=[@{$items{link}}];
                        $links{$page}=[@{$items{link}}];
-                       $depends{$page}=$items{depends}[0] if exists $items{depends};
+                       $depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
                        $destsources{$_}=$page foreach @{$items{dest}};
                        $renderedfiles{$page}=[@{$items{dest}}];
                        $pagecase{lc $page}=$page;
@@ -340,4 +335,14 @@ sub get_banned_users () {
        return @ret;
 }
 
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+       my $a=shift;
+       my $b=shift;
+
+       return $a if $a eq $b;
+       return "($a) or ($b)";
+}
+
 1