releasing version 2.31.1

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index aa9b73141e28697181169db083d4151e52c90b74..2682e13ae5b6e76ac67df22c59319dba07fac51a 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -85,11 +85,6 @@ sub genpage ($$) { #{{{
                $actions++;
        }
                
                $actions++;
        }
                

-       if ($config{rcs}) {
-               $template->param(recentchangesurl => urlto("recentchanges", $page));
-               $actions++;
-       }
-

        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
        if (length $config{historyurl}) {
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;


@@ -131,6 +126,7 @@ sub genpage ($$) { #{{{
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),

+               ctime => displaytime($pagectime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -208,7 +204,6 @@ sub render ($) { #{{{
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));
                
                my $output=htmlpage($page);
                writefile($output, $config{destdir}, genpage($page, $content));

-               utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);

        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);


@@ -234,7 +229,6 @@ sub render ($) { #{{{
                                }
                        }
                });
                                }
                        }
                });

-               utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);

        }
 } #}}}
 
        }
 } #}}}
 


@@ -319,29 +313,43 @@ sub refresh () { #{{{
                }, $dir);
        };
 
                }, $dir);
        };
 

-       my %rendered;
+       my (%rendered, @add, @del, @internal);

 
        # check for added or removed pages
 
        # check for added or removed pages

-       my @add;

        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
        foreach my $file (@files) {
                my $page=pagename($file);
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {

-                       push @add, $file;
+                       if (isinternal($page)) {
+                               push @internal, $file;
+                       }
+                       else {
+                               push @add, $file;
+                       }

                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                        $pagecase{lc $page}=$page;
                        if ($config{getctime} && -e "$config{srcdir}/$file") {

-                               $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
+                               eval {
+                                       my $time=rcs_getctime("$config{srcdir}/$file");
+                                       $pagectime{$page}=$time;
+                               };
+                               if ($@) {
+                                       print STDERR $@;
+                               }

                        }
                        }

-                       elsif (! exists $pagectime{$page}) {
+                       if (! exists $pagectime{$page}) {

                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }
        }
                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }
        }

-       my @del;

        foreach my $page (keys %pagemtime) {
                if (! $exists{$page}) {
        foreach my $page (keys %pagemtime) {
                if (! $exists{$page}) {

-                       debug(sprintf(gettext("removing old page %s"), $page));
-                       push @del, $pagesources{$page};
+                       if (isinternal($page)) {
+                               push @internal, $pagesources{$page};
+                       }
+                       else {
+                               debug(sprintf(gettext("removing old page %s"), $page));
+                               push @del, $pagesources{$page};
+                       }

                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;


@@ -366,7 +374,14 @@ sub refresh () { #{{{
                    $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$mtime;
                    $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$mtime;

-                       push @needsbuild, $file;
+                       if (isinternal($page)) {
+                               push @internal, $file;
+                               # Preprocess internal page in scan-only mode.
+                               preprocess($page, $page, readfile(srcfile($file)), 1);
+                       }
+                       else {
+                               push @needsbuild, $file;
+                       }

                }
        }
        run_hooks(needsbuild => sub { shift->(\@needsbuild) });
                }
        }
        run_hooks(needsbuild => sub { shift->(\@needsbuild) });


@@ -382,6 +397,15 @@ sub refresh () { #{{{
                render($file);
                $rendered{$file}=1;
        }
                render($file);
                $rendered{$file}=1;
        }

+       foreach my $file (@internal) {
+               # internal pages are not rendered
+               my $page=pagename($file);
+               delete $depends{$page};
+               foreach my $old (@{$renderedfiles{$page}}) {
+                       delete $destsources{$old};
+               }
+               $renderedfiles{$page}=[];
+       }

        
        # rebuild pages that link to added or removed pages
        if (@add || @del) {
        
        # rebuild pages that link to added or removed pages
        if (@add || @del) {


@@ -397,13 +421,17 @@ sub refresh () { #{{{
                }
        }
 
                }
        }
 

-       if (%rendered || @del) {
+       if (%rendered || @del || @internal) {
+               my @changed=(keys %rendered, @del);
+

                # rebuild dependant pages
                foreach my $f (@files) {
                        next if $rendered{$f};
                        my $p=pagename($f);
                        if (exists $depends{$p}) {
                # rebuild dependant pages
                foreach my $f (@files) {
                        next if $rendered{$f};
                        my $p=pagename($f);
                        if (exists $depends{$p}) {

-                               foreach my $file (keys %rendered, @del) {
+                               # only consider internal files
+                               # if the page explicitly depends on such files
+                               foreach my $file (@changed, $depends{$p}=~/internal\(/ ? @internal : ()) {

                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p}, location => $p)) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p}, location => $p)) {


@@ -419,7 +447,7 @@ sub refresh () { #{{{
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
                my %linkchanged;
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
                my %linkchanged;

-               foreach my $file (keys %rendered, @del) {
+               foreach my $file (@changed) {

                        my $page=pagename($file);
                        
                        if (exists $links{$page}) {
                        my $page=pagename($file);
                        
                        if (exists $links{$page}) {


@@ -441,6 +469,7 @@ sub refresh () { #{{{
                                }
                        }
                }
                                }
                        }
                }

+

                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                foreach my $link (keys %linkchanged) {
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {