Revert "Revert the effects of find_del_files() for (re)autoadded files."

This reverts commit 31680111f0062f07727d14fcf291c98978ad5a2f.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 56c491339fec4690a6cf720e339aca8dac527934..1770703a58f3808d53e0a95ddcfe408b60b847cb 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,8 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles
            %pagesources %destsources %depends %depends_simple %hooks
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles
            %pagesources %destsources %depends %depends_simple %hooks

-           %forcerebuild %loaded_plugins @autofiles %dellinks
-           %delrenderedfiles};
+           %forcerebuild %loaded_plugins @autofiles};

 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5b72b6de1665a26d319aa3ee2664ad05a409a45b..fc71c89191b4c85b114a54f0570030a02845c096 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -392,9 +392,7 @@ sub find_del_files ($) {
                        else {
                                push @del, $pagesources{$page};
                        }
                        else {
                                push @del, $pagesources{$page};
                        }

-                       $dellinks{$page}= $links{$page};

                        $links{$page}=[];
                        $links{$page}=[];

-                       $delrenderedfiles{$page}= $renderedfiles{$page};

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


@@ -644,14 +642,8 @@ sub refresh () {
                scan($file);
        }
 
                scan($file);
        }
 

-       my %del_hash = map {$_, 1} @$del;

        while (my $autofile = shift (@autofiles)) {
                my $page=pagename($autofile);
        while (my $autofile = shift (@autofiles)) {
                my $page=pagename($autofile);

-    if (exists $del_hash{$page}) {
-                       $links{$page}= $dellinks{$page};
-                       $renderedfiles{$page}= $delrenderedfiles{$page};
-                       delete $del_hash{$page};
-               }

                if ($pages->{$page}) {
                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
                }
                if ($pages->{$page}) {
                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
                }


@@ -663,7 +655,6 @@ sub refresh () {
 
                scan($autofile);
        }
 
                scan($autofile);
        }

-       $del = [keys %del_hash];

 
        calculate_links();
        
 
        calculate_links();