hopefully fixed in master

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5336d4f545e3bc7cff7cc606fc91432e2e3721bd..632ec980b293cce70869e5dedb0f93249265e884 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -5,11 +5,8 @@ package IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

-use Encode;

 
 

-my (%backlinks, %rendered, @new, @del, @internal, @internal_change, @files,
-       %page_exists, %oldlink_targets, %backlinkchanged,
-       %linkchangers);
+my (%backlinks, %rendered, %scanned);

 our %brokenlinks;
 my $links_calculated=0;
 
 our %brokenlinks;
 my $links_calculated=0;
 


@@ -45,7 +42,7 @@ sub backlinks ($) {
        my @links;
        foreach my $p (backlink_pages($page)) {
                my $href=urlto($p, $page);
        my @links;
        foreach my $p (backlink_pages($page)) {
                my $href=urlto($p, $page);

-                
+

                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;
                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;


@@ -63,6 +60,10 @@ sub backlinks ($) {
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;

+       
+       run_hooks(indexhtml => sub {
+               shift->(page => $page, destpage => $page, content => $content);
+       });

 
        my $templatefile;
        run_hooks(templatefile => sub {
 
        my $templatefile;
        run_hooks(templatefile => sub {


@@ -72,35 +73,43 @@ sub genpage ($$) {
                        $templatefile=$file;
                }
        });
                        $templatefile=$file;
                }
        });

-       my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
-       my $actions=0;
+       my $template;
+       if (defined $templatefile) {
+               $template=template_depends($templatefile, $page,
+                       blind_cache => 1);
+       }
+       else {
+               # no explicit depends as special case
+               $template=template('page.tmpl', 
+                       blind_cache => 1);
+       }

 
 

+       my $actions=0;

        if (length $config{cgiurl}) {
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => $page))
-                       if IkiWiki->can("cgi_editpage");
-               $template->param(prefsurl => cgiurl(do => "prefs"))
-                       if exists $hooks{auth};
-               $actions++;
+               if (IkiWiki->can("cgi_editpage")) {
+                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                       $actions++;
+               }

        }
        }

-               

        if (defined $config{historyurl} && length $config{historyurl}) {
                my $u=$config{historyurl};
        if (defined $config{historyurl} && length $config{historyurl}) {
                my $u=$config{historyurl};

-               $u=~s/\[\[file\]\]/$pagesources{$page}/g;
+               my $p=uri_escape_utf8($pagesources{$page}, '^A-Za-z0-9\-\._~/');
+               $u=~s/\[\[file\]\]/$p/g;

                $template->param(historyurl => $u);
                $actions++;
        }
        if ($config{discussion}) {
                $template->param(historyurl => $u);
                $actions++;
        }
        if ($config{discussion}) {

-               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&

                   (length $config{cgiurl} ||
                    exists $links{$page."/".$config{discussionpage}})) {
                        $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
                        $actions++;
                }
        }
                   (length $config{cgiurl} ||
                    exists $links{$page."/".$config{discussionpage}})) {
                        $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
                        $actions++;
                }
        }

-

        if ($actions) {
                $template->param(have_actions => 1);
        }
        if ($actions) {
                $template->param(have_actions => 1);
        }

+       templateactions($template, $page);

 
        my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
        my ($backlinks, $more_backlinks);
 
        my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
        my ($backlinks, $more_backlinks);


@@ -122,8 +131,10 @@ 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}),
+               ctime => displaytime($pagectime{$page}, undef, 1),

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

+               html5 => $config{html5},
+               responsive_layout => $config{responsive_layout},

        );
 
        run_hooks(pagetemplate => sub {
        );
 
        run_hooks(pagetemplate => sub {


@@ -132,10 +143,6 @@ sub genpage ($$) {
        
        $content=$template->output;
        
        
        $content=$template->output;
        

-       run_hooks(postscan => sub {
-               shift->(page => $page, content => $content);
-       });
-

        run_hooks(format => sub {
                $content=shift->(
                        page => $page,
        run_hooks(format => sub {
                $content=shift->(
                        page => $page,


@@ -148,6 +155,8 @@ sub genpage ($$) {
 
 sub scan ($) {
        my $file=shift;
 
 sub scan ($) {
        my $file=shift;

+       return if $scanned{$file};
+       $scanned{$file}=1;

 
        debug(sprintf(gettext("scanning %s"), $file));
 
 
        debug(sprintf(gettext("scanning %s"), $file));
 


@@ -166,6 +175,10 @@ sub scan ($) {
                else {
                        $links{$page}=[];
                }
                else {
                        $links{$page}=[];
                }

+               delete $typedlinks{$page};
+
+               # Preprocess in scan-only mode.
+               preprocess($page, $page, $content, 1);

 
                run_hooks(scan => sub {
                        shift->(
 
                run_hooks(scan => sub {
                        shift->(


@@ -173,9 +186,6 @@ sub scan ($) {
                                content => $content,
                        );
                });
                                content => $content,
                        );
                });

-
-               # Preprocess in scan-only mode.
-               preprocess($page, $page, $content, 1);

        }
        else {
                will_render($file, $file, 1);
        }
        else {
                will_render($file, $file, 1);


@@ -255,12 +265,13 @@ sub render ($$) {
        }
 }
 
        }
 }
 

-sub prune ($) {
+sub prune ($;$) {

        my $file=shift;
        my $file=shift;

+       my $up_to=shift;

 
        unlink($file);
        my $dir=dirname($file);
 
        unlink($file);
        my $dir=dirname($file);

-       while (rmdir($dir)) {
+       while ((! defined $up_to || $dir =~ m{^\Q$up_to\E\/}) && rmdir($dir)) {

                $dir=dirname($dir);
        }
 }
                $dir=dirname($dir);
        }
 }


@@ -279,71 +290,176 @@ sub srcdir_check () {
        
 }
 
        
 }
 

-sub find_src_files () {
-       my @ret;
+# Finds all files in the srcdir, and the underlaydirs.
+# Returns the files, and their corresponding pages.
+#
+# When run in only_underlay mode, adds only the underlay files to
+# the files and pages passed in.
+sub find_src_files (;$$$) {
+       my $only_underlay=shift;
+       my @files;
+       if (defined $_[0]) {
+               @files=@{shift()};
+       }
+       my %pages;
+       if (defined $_[0]) {
+               %pages=%{shift()};
+       }
+

        eval q{use File::Find};
        error($@) if $@;
        eval q{use File::Find};
        error($@) if $@;

-       find({
-               no_chdir => 1,
-               wanted => sub {
-                       $_=decode_utf8($_);
-                       if (file_pruned($_, $config{srcdir})) {
-                               $File::Find::prune=1;
-                       }
-                       elsif (! -l $_ && ! -d _) {
-                               my ($f)=/$config{wiki_file_regexp}/; # untaint
-                               if (! defined $f) {
-                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-                               }
-                               else {
-                                       $f=~s/^\Q$config{srcdir}\E\/?//;
-                                       push @ret, $f;
-                                       my $page = pagename($f);
-                                       if ($page_exists{$page}) {
-                                               debug(sprintf(gettext("%s has multiple possible source pages"), $page));
-                                       }
-                                       $page_exists{$page}=1;
+
+       eval q{use Cwd};
+       die $@ if $@;
+       my $origdir=getcwd();
+       my $abssrcdir=Cwd::abs_path($config{srcdir});
+       
+       @IkiWiki::underlayfiles=();
+
+       my ($page, $underlay);
+       my $helper=sub {
+               my $file=decode_utf8($_);
+
+               return if -l $file || -d _;
+               $file=~s/^\.\///;
+               return if ! length $file;
+               $page = pagename($file);
+               if (! exists $pagesources{$page} &&
+                   file_pruned($file)) {
+                       $File::Find::prune=1;
+                       return;
+               }
+
+               my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+               if (! defined $f) {
+                       warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+                       return;
+               }
+       
+               if ($underlay) {
+                       # avoid underlaydir override attacks; see security.mdwn
+                       if (! -l "$abssrcdir/$f" && ! -e _) {
+                               if (! $pages{$page}) {
+                                       push @files, $f;
+                                       push @IkiWiki::underlayfiles, $f;
+                                       $pages{$page}=1;

                                }
                        }
                                }
                        }

-               },
-       }, $config{srcdir});
-       foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+               }
+               else {
+                       push @files, $f;
+                       if ($pages{$page}) {
+                               debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+                       }
+                       $pages{$page}=1;
+               }
+       };
+
+       unless ($only_underlay) {
+               chdir($config{srcdir}) || die "chdir $config{srcdir}: $!";

                find({
                        no_chdir => 1,
                find({
                        no_chdir => 1,

-                       wanted => sub {
-                               $_=decode_utf8($_);
-                               if (file_pruned($_, $dir)) {
-                                       $File::Find::prune=1;
-                               }
-                               elsif (! -l $_ && ! -d _) {
-                                       my ($f)=/$config{wiki_file_regexp}/; # untaint
-                                       if (! defined $f) {
-                                               warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-                                       }
-                                       else {
-                                               $f=~s/^\Q$dir\E\/?//;
-                                               # avoid underlaydir
-                                               # override attacks; see
-                                               # security.mdwn
-                                               if (! -l "$config{srcdir}/$f" && 
-                                                   ! -e _) {
-                                                       my $page=pagename($f);
-                                                       if (! $page_exists{$page}) {
-                                                               push @ret, $f;
-                                                               $page_exists{$page}=1;
-                                                       }
-                                               }
-                                       }
-                               }
-                       },
-               }, $dir);
+                       wanted => $helper,
+               }, '.');
+               chdir($origdir) || die "chdir $origdir: $!";
+       }
+
+       $underlay=1;
+       foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
+               if (chdir($_)) {
+                       find({
+                               no_chdir => 1,
+                               wanted => $helper,
+                       }, '.');
+                       chdir($origdir) || die "chdir: $!";
+               }

        };
        };

-       return \@ret;
+
+       return \@files, \%pages;
+}
+
+# Given a hash of files that have changed, and a hash of files that were
+# deleted, should return the same results as find_src_files, with the same
+# sanity checks. But a lot faster!
+sub process_changed_files ($$) {
+       my $changed_raw=shift;
+       my $deleted_raw=shift;
+
+       my @files;
+       my %pages;
+
+       foreach my $file (keys %$changed_raw) {
+               my $page = pagename($file);
+               next if ! exists $pagesources{$page} && file_pruned($file);
+               my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+               if (! defined $f) {
+                       warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+                       next;
+               }
+               push @files, $f;
+               if ($pages{$page}) {
+                       debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+               }
+               $pages{$page}=1;
+       }
+
+       # So far, we only have the changed files. Now add in all the old
+       # files that were not changed or deleted, excluding ones that came
+       # from the underlay.
+       my %old_underlay;
+       foreach my $f (@IkiWiki::underlayfiles) {
+               $old_underlay{$f}=1;
+       }
+       foreach my $page (keys %pagesources) {
+               my $f=$pagesources{$page};
+               unless ($old_underlay{$f} || exists $pages{$page} || exists $deleted_raw->{$f}) {
+                       $pages{$page}=1;
+                       push @files, $f;
+               }
+       }
+
+       # add in the underlay
+       find_src_files(1, \@files, \%pages);

 }
 
 }
 

-sub process_new_files () {
-       foreach my $file (@files) {
+sub find_new_files ($) {
+       my $files=shift;
+       my @new;
+       my @internal_new;
+
+       my $times_noted;
+
+       foreach my $file (@$files) {

                my $page=pagename($file);
                my $page=pagename($file);

+
+               if ($config{rcs} && $config{gettime} &&
+                   -e "$config{srcdir}/$file") {
+                       if (! $times_noted) {
+                               debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+                               $times_noted=1;
+                       }
+
+                       eval {
+                               my $ctime=rcs_getctime($file);
+                               if ($ctime > 0) {
+                                       $pagectime{$page}=$ctime;
+                               }
+                       };
+                       if ($@) {
+                               print STDERR $@;
+                       }
+                       my $mtime;
+                       eval {
+                               $mtime=rcs_getmtime($file);
+                       };
+                       if ($@) {
+                               print STDERR $@;
+                       }
+                       elsif ($mtime > 0) {
+                               utime($mtime, $mtime, "$config{srcdir}/$file");
+                       }
+               }
+

                if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
                        # the page has changed its type
                        $forcerebuild{$page}=1;
                if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
                        # the page has changed its type
                        $forcerebuild{$page}=1;


@@ -351,85 +467,116 @@ sub process_new_files () {
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {

-                               push @internal, $file;
+                               push @internal_new, $file;

                        }
                        else {
                                push @new, $file;
                        }
                        else {
                                push @new, $file;

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

                        }
                        $pagecase{lc $page}=$page;
                        if (! exists $pagectime{$page}) {
                        }
                        $pagecase{lc $page}=$page;
                        if (! exists $pagectime{$page}) {

-                               $pagectime{$page}=(srcfile_stat($file))[10];
+                               my $ctime=(srcfile_stat($file, 1))[10];
+                               $pagectime{$page}=$ctime if defined $ctime;

                        }
                }
        }
                        }
                }
        }

+
+       return \@new, \@internal_new;

 }
 
 }
 

-sub process_del_files () {
-       foreach my $page (keys %pagemtime) {
-               if (! $page_exists{$page}) {
+sub find_del_files ($) {
+       my $pages=shift;
+       my @del;
+       my @internal_del;
+
+       foreach my $page (keys %pagesources) {
+               if (! $pages->{$page}) {

                        if (isinternal($page)) {
                        if (isinternal($page)) {

-                               push @internal, $pagesources{$page};
+                               push @internal_del, $pagesources{$page};

                        }
                        else {
                        }
                        else {

-                               debug(sprintf(gettext("removing old page %s"), $page));

                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];
                                push @del, $pagesources{$page};
                        }
                        $links{$page}=[];

+                       delete $typedlinks{$page};

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

-                       foreach my $old (@{$oldrenderedfiles{$page}}) {
-                               prune($config{destdir}."/".$old);
-                       }
-                       delete $pagesources{$page};
-                       foreach my $source (keys %destsources) {
-                               if ($destsources{$source} eq $page) {
-                                       delete $destsources{$source};
-                               }
+               }
+       }
+
+       return \@del, \@internal_del;
+}
+
+sub remove_del (@) {
+       foreach my $file (@_) {
+               my $page=pagename($file);
+               if (! isinternal($page)) {
+                       debug(sprintf(gettext("removing obsolete %s"), $page));
+               }
+       
+               foreach my $old (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$old, $config{destdir});
+               }
+
+               foreach my $source (keys %destsources) {
+                       if ($destsources{$source} eq $page) {
+                               delete $destsources{$source};

                        }
                }
                        }
                }

+       
+               delete $pagecase{lc $page};
+               $delpagesources{$page}=$pagesources{$page};
+               delete $pagesources{$page};

        }
 }
 
        }
 }
 

-sub find_needsbuild () {
-       my @needsbuild;
-       foreach my $file (@files) {
+sub find_changed ($) {
+       my $files=shift;
+       my @changed;
+       my @internal_changed;
+       foreach my $file (@$files) {

                my $page=pagename($file);
                my $page=pagename($file);

-               my ($srcfile, @stat)=srcfile_stat($file);
-               if (! exists $pagemtime{$page} ||
-                   $stat[9] > $pagemtime{$page} ||
-                   $forcerebuild{$page}) {
+               my ($srcfile, @stat)=srcfile_stat($file, 1);
+               if (defined $srcfile && 
+                   (! exists $pagemtime{$page} ||
+                    $stat[9] > $pagemtime{$page} ||
+                    $forcerebuild{$page})) {

                        $pagemtime{$page}=$stat[9];
 
                        if (isinternal($page)) {
                        $pagemtime{$page}=$stat[9];
 
                        if (isinternal($page)) {

+                               my $content = readfile($srcfile);
+

                                # Preprocess internal page in scan-only mode.
                                # Preprocess internal page in scan-only mode.

-                               preprocess($page, $page, readfile($srcfile), 1);
-                               push @internal_change, $file;
+                               preprocess($page, $page, $content, 1);
+
+                               run_hooks(scan => sub {
+                                       shift->(
+                                               page => $page,
+                                               content => $content,
+                                       );
+                               });
+
+                               push @internal_changed, $file;

                        }
                        else {
                        }
                        else {

-                               push @needsbuild, $file;
+                               push @changed, $file;

                        }
                }
        }
                        }
                }
        }

-       return @needsbuild;
+       return \@changed, \@internal_changed;

 }
 
 }
 

-sub calculate_old_links ($) {
-       my $file=shift;
-       my $page=pagename($file);
-       if (exists $oldlinks{$page}) {
-               foreach my $l (@{$oldlinks{$page}}) {
-                       $oldlink_targets{$page}{$l}=bestlink($page, $l);
+sub calculate_old_links ($$) {
+       my ($changed, $del)=@_;
+       my %oldlink_targets;
+       foreach my $file (@$changed, @$del) {
+               my $page=pagename($file);
+               if (exists $oldlinks{$page}) {
+                       foreach my $l (@{$oldlinks{$page}}) {
+                               $oldlink_targets{$page}{$l}=bestlink($page, $l);
+                       }

                }
        }
                }
        }

+       return \%oldlink_targets;

 }
 
 sub derender_internal ($) {
 }
 
 sub derender_internal ($) {


@@ -458,48 +605,100 @@ sub remove_unrendered () {
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
                                debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
                                debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));

-                               prune($config{destdir}."/".$file);
+                               prune($config{destdir}."/".$file, $config{destdir});

                        }
                }
        }
 }
 
                        }
                }
        }
 }
 

-sub calculate_changed_links ($) {
-       my $file=shift;
-       my $page=pagename($file);
-       if (exists $links{$page}) {
-               foreach my $l (@{$links{$page}}) {
-                       my $target=bestlink($page, $l);
-                       if (! exists $oldlink_targets{$page}{$l} ||
-                           $target ne $oldlink_targets{$page}{$l}) {
-                               $backlinkchanged{$l}=1;
-                               $linkchangers{lc($page)}=1;
-                       }
-                       delete $oldlink_targets{$page}{$l};
+sub link_types_changed ($$) {
+       # each is of the form { type => { link => 1 } }
+       my $new = shift;
+       my $old = shift;
+
+       return 0 if !defined $new && !defined $old;
+       return 1 if (!defined $new && %$old) || (!defined $old && %$new);
+
+       while (my ($type, $links) = each %$new) {
+               foreach my $link (keys %$links) {
+                       return 1 unless exists $old->{$type}{$link};

                }
        }
                }
        }

-       if (exists $oldlink_targets{$page} &&
-           %{$oldlink_targets{$page}}) {
-               foreach my $target (keys %{$oldlink_targets{$page}}) {
-                       $backlinkchanged{$target}=1;
+
+       while (my ($type, $links) = each %$old) {
+               foreach my $link (keys %$links) {
+                       return 1 unless exists $new->{$type}{$link};

                }
                }

-               $linkchangers{lc($page)}=1;

        }
        }

+
+       return 0;

 }
 
 }
 

-sub render_dependent () {
-       my @changed=(keys %rendered, @del);
-       my @exists_changed=(@new, @del);
+sub calculate_changed_links ($$$) {
+       my ($changed, $del, $oldlink_targets)=@_;
+
+       my (%backlinkchanged, %linkchangers);
+
+       foreach my $file (@$changed, @$del) {
+               my $page=pagename($file);
+
+               if (exists $links{$page}) {
+                       foreach my $l (@{$links{$page}}) {
+                               my $target=bestlink($page, $l);
+                               if (! exists $oldlink_targets->{$page}{$l} ||
+                                   $target ne $oldlink_targets->{$page}{$l}) {
+                                       $backlinkchanged{$target}=1;
+                                       $linkchangers{lc($page)}=1;
+                               }
+                               delete $oldlink_targets->{$page}{$l};
+                       }
+               }
+               if (exists $oldlink_targets->{$page} &&
+                   %{$oldlink_targets->{$page}}) {
+                       foreach my $target (values %{$oldlink_targets->{$page}}) {
+                               $backlinkchanged{$target}=1;
+                       }
+                       $linkchangers{lc($page)}=1;
+               }
+
+               # we currently assume that changing the type of a link doesn't
+               # change backlinks
+               if (!exists $linkchangers{lc($page)}) {
+                       if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) {
+                               $linkchangers{lc($page)}=1;
+                       }
+               }
+       }
+
+       return \%backlinkchanged, \%linkchangers;
+}
+
+sub render_dependent ($$$$$$$) {
+       my ($files, $new, $internal_new, $del, $internal_del,
+               $internal_changed, $linkchangers)=@_;
+
+       my @changed=(keys %rendered, @$del);
+       my @exists_changed=(@$new, @$del);

        
        my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
        my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
        
        my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
        my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;

+
+       foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
+               if ($rendered{$p} || grep { $_ eq $p } @$del) {
+                       foreach my $f (@$files) {
+                               next if $rendered{$f};
+                               render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
+                       }
+                       return 0;
+               }
+       }

         
         

-       foreach my $f (@files) {
+       foreach my $f (@$files) {

                next if $rendered{$f};
                my $p=pagename($f);
                my $reason = undef;
                next if $rendered{$f};
                my $p=pagename($f);
                my $reason = undef;

-       
-               if (exists $depends_simple{$p}) {
+
+               if (exists $depends_simple{$p} && ! defined $reason) {

                        foreach my $d (keys %{$depends_simple{$p}}) {
                                if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
                                     $lc_changed{$d})
                        foreach my $d (keys %{$depends_simple{$p}}) {
                                if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
                                     $lc_changed{$d})


@@ -508,7 +707,7 @@ sub render_dependent () {
                                     $lc_exists_changed{$d})
                                    ||
                                    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
                                     $lc_exists_changed{$d})
                                    ||
                                    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&

-                                    $linkchangers{$d})
+                                    $linkchangers->{$d})

                                ) {
                                        $reason = $d;
                                        last;
                                ) {
                                        $reason = $d;
                                        last;


@@ -517,37 +716,54 @@ sub render_dependent () {
                }
        
                if (exists $depends{$p} && ! defined $reason) {
                }
        
                if (exists $depends{$p} && ! defined $reason) {

-                       D: foreach my $d (keys %{$depends{$p}}) {
-                               my $sub=pagespec_translate($d);
-                               next if $@ || ! defined $sub;
+                       foreach my $dep (keys %{$depends{$p}}) {
+                               my $sub=pagespec_translate($dep);
+                               next unless defined $sub;

 
                                # only consider internal files
                                # if the page explicitly depends
                                # on such files
 
                                # only consider internal files
                                # if the page explicitly depends
                                # on such files

-                               my $internal_dep=$d =~ /internal\(/;
-
-                               my @candidates;
-                               if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-                                       @candidates=@exists_changed;
-                                       push @candidates, @internal
-                                               if $internal_dep;
-                               }
-                               if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
-                                       @candidates=@changed;
-                                       push @candidates, @internal, @internal_change
-                                               if $internal_dep;
-                               }
-
-                               foreach my $file (@candidates) {
-                                       next if $file eq $f;
-                                       my $page=pagename($file);
-                                       if ($sub->($page, location => $p)) {
-                                               if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
-                                                       next unless $linkchangers{lc($page)};
+                               my $internal_dep=$dep =~ /(?:internal|comment|comment_pending)\(/;
+
+                               my $in=sub {
+                                       my $list=shift;
+                                       my $type=shift;
+                                       foreach my $file (@$list) {
+                                               next if $file eq $f;
+                                               my $page=pagename($file);
+                                               if ($sub->($page, location => $p)) {
+                                                       if ($type == $IkiWiki::DEPEND_LINKS) {
+                                                               next unless $linkchangers->{lc($page)};
+                                                       }
+                                                       $reason=$page;
+                                                       return 1;

                                                }
                                                }

-                                               $reason = $page;
-                                               last D;

                                        }
                                        }

+                                       return undef;
+                               };
+
+                               if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
+                                       last if $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+                                       last if $internal_dep && (
+                                               $in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
+                                               $in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
+                                               $in->($internal_changed, $IkiWiki::DEPEND_CONTENT)
+                                       );
+                               }
+                               if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
+                                       last if $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+                                       last if $internal_dep && (
+                                               $in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
+                                               $in->($internal_del, $IkiWiki::DEPEND_PRESENCE)
+                                       );
+                               }
+                               if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
+                                       last if $in->(\@changed, $IkiWiki::DEPEND_LINKS);
+                                       last if $internal_dep && (
+                                               $in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
+                                               $in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
+                                               $in->($internal_changed, $IkiWiki::DEPEND_LINKS)
+                                       );

                                }
                        }
                }
                                }
                        }
                }


@@ -561,8 +777,9 @@ sub render_dependent () {
        return 0;
 }
 
        return 0;
 }
 

-sub render_backlinks () {
-       foreach my $link (keys %backlinkchanged) {
+sub render_backlinks ($) {
+       my $backlinkchanged=shift;
+       foreach my $link (keys %$backlinkchanged) {

                my $linkfile=$pagesources{$link};
                if (defined $linkfile) {
                        render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));
                my $linkfile=$pagesources{$link};
                if (defined $linkfile) {
                        render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));


@@ -570,53 +787,161 @@ sub render_backlinks () {
        }
 }
 
        }
 }
 

+sub gen_autofile ($$$) {
+       my $autofile=shift;
+       my $pages=shift;
+       my $del=shift;
+
+       if (file_pruned($autofile)) {
+               return;
+       }
+
+       my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+       if (! defined $file) {
+               return;
+       }
+
+       # Remember autofiles that were tried, and never try them again later.
+       if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
+               return;
+       }
+       $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
+
+       if (srcfile($autofile, 1) || file_pruned($autofile)) {
+               return;
+       }
+       
+       if (-l $file || -d _ || -e _) {
+               return;
+       }
+
+       my $page = pagename($file);
+       if ($pages->{$page}) {
+               return;
+       }
+
+       if (grep { $_ eq $autofile } @$del) {
+               return;
+       }
+
+       $autofiles{$autofile}{generator}->();
+       $pages->{$page}=1;
+       return 1;
+}
+

 sub refresh () {
 sub refresh () {

+       $phase = PHASE_SCAN;
+

        srcdir_check();
        run_hooks(refresh => sub { shift->() });
        srcdir_check();
        run_hooks(refresh => sub { shift->() });

-       @files=@{find_src_files()};
-       process_new_files();
-       process_del_files();
-
-       my @needsbuild=find_needsbuild();
-       run_hooks(needsbuild => sub { shift->(\@needsbuild) });
-
-       foreach my $file (@needsbuild, @del) {
-               calculate_old_links($file);
+       my ($files, $pages, $new, $internal_new, $del, $internal_del, $changed, $internal_changed);
+       my $want_find_changes=$config{only_committed_changes} &&
+               exists $IkiWiki::hooks{rcs}{rcs_find_changes} &&
+               exists $IkiWiki::hooks{rcs}{rcs_get_current_rev};
+       if (! $config{rebuild} && $want_find_changes && defined $IkiWiki::lastrev && length $IkiWiki::lastrev) {
+               my ($changed_raw, $del_raw);
+               ($changed_raw, $del_raw, $IkiWiki::lastrev) = $IkiWiki::hooks{rcs}{rcs_find_changes}{call}->($IkiWiki::lastrev);
+               ($files, $pages)=process_changed_files($changed_raw, $del_raw);

        }
        }

+       else {
+               ($files, $pages)=find_src_files();
+       }
+       if ($want_find_changes) {
+               if (! defined($IkiWiki::lastrev) || ! length $IkiWiki::lastrev) {
+                       $IkiWiki::lastrev=$IkiWiki::hooks{rcs}{rcs_get_current_rev}{call}->();
+               }
+       }
+       ($new, $internal_new)=find_new_files($files);
+       ($del, $internal_del)=find_del_files($pages);
+       ($changed, $internal_changed)=find_changed($files);
+       my %existingfiles;
+       run_hooks(needsbuild => sub {
+               my $ret=shift->($changed, [@$del, @$internal_del]);
+               if (ref $ret eq 'ARRAY' && $ret != $changed) {
+                       if (! %existingfiles) {
+                               foreach my $f (@$files) {
+                                       $existingfiles{$f}=1;
+                               }
+                       }
+                       @$changed=grep $existingfiles{$_}, @$ret;
+               }
+       });
+       my $oldlink_targets=calculate_old_links($changed, $del);

 
 

-       foreach my $file (@needsbuild) {
+       foreach my $file (@$changed) {

                scan($file);
        }
 
                scan($file);
        }
 

+       foreach my $autofile (keys %autofiles) {
+               if (gen_autofile($autofile, $pages, $del)) {
+                       push @{$files}, $autofile;
+                       push @{$new}, $autofile if find_new_files([$autofile]);
+                       push @{$changed}, $autofile if find_changed([$autofile]);
+                       
+                       scan($autofile);
+               }
+       }
+

        calculate_links();
 
        calculate_links();
 

-       foreach my $file (@needsbuild) {
+       # At this point it becomes OK to start matching pagespecs.
+       $phase = PHASE_RENDER;
+
+       remove_del(@$del, @$internal_del);
+
+       foreach my $file (@$changed) {

                render($file, sprintf(gettext("building %s"), $file));
        }
                render($file, sprintf(gettext("building %s"), $file));
        }

-       foreach my $file (@internal, @internal_change) {
+       foreach my $file (@$internal_new, @$internal_del, @$internal_changed) {

                derender_internal($file);
        }
 
                derender_internal($file);
        }
 

-       foreach my $file (@needsbuild, @del) {
-               calculate_changed_links($file);
-       }
+       run_hooks(build_affected => sub {
+               my %affected = shift->();
+               while (my ($page, $message) = each %affected) {
+                       next unless exists $pagesources{$page};
+                       render($pagesources{$page}, $message);
+               }
+       });
+
+       my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
+               $del, $oldlink_targets);

 
 

-       foreach my $file (@new, @del) {
+       foreach my $file (@$new, @$del) {

                render_linkers($file);
        }
                render_linkers($file);
        }

-       
-       if (@needsbuild || @del || @internal || @internal_change) {
-               1 while render_dependent();
+
+       if (@$changed || @$internal_changed ||
+           @$del || @$internal_del || @$internal_new) {
+               1 while render_dependent($files, $new, $internal_new,
+                       $del, $internal_del, $internal_changed,
+                       $linkchangers);

        }
 
        }
 

-       render_backlinks();
+       render_backlinks($backlinkchanged);

        remove_unrendered();
 
        remove_unrendered();
 

-       if (@del) {
-               run_hooks(delete => sub { shift->(@del) });
+       if (@$del || @$internal_del) {
+               run_hooks(delete => sub { shift->(@$del, @$internal_del) });

        }
        if (%rendered) {
        }
        if (%rendered) {

-               run_hooks(change => sub { shift->(keys %rendered) });
+               run_hooks(rendered => sub { shift->(keys %rendered) });
+               run_hooks(change => sub { shift->(keys %rendered) }); # back-compat
+       }
+       my %all_changed = map { $_ => 1 }
+               @$new, @$changed, @$del,
+               @$internal_new, @$internal_changed, @$internal_del;
+       run_hooks(changes => sub { shift->(keys %all_changed) });
+}
+
+sub clean_rendered {
+       lockwiki();
+       loadindex();
+       remove_unrendered();
+       foreach my $page (keys %oldrenderedfiles) {
+               foreach my $file (@{$oldrenderedfiles{$page}}) {
+                       prune($config{destdir}."/".$file, $config{destdir});
+               }

        }
 }
 
        }
 }
 


@@ -625,6 +950,10 @@ sub commandline_render () {
        loadindex();
        unlockwiki();
 
        loadindex();
        unlockwiki();
 

+       # This function behaves as though it's in the render phase;
+       # all other files are assumed to have been scanned last time.
+       $phase = PHASE_RENDER;
+

        my $srcfile=possibly_foolish_untaint($config{render});
        my $file=$srcfile;
        $file=~s/\Q$config{srcdir}\E\/?//;
        my $srcfile=possibly_foolish_untaint($config{render});
        my $file=$srcfile;
        $file=~s/\Q$config{srcdir}\E\/?//;