Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d5e81f1b9bb5231c1653925072cc13ec8510d069..cf0c3fe0822a8d9ee0c7d47076c35d25e315baff 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -8,26 +8,31 @@ use IkiWiki;
 use Encode;
 
 my %backlinks;
 use Encode;
 
 my %backlinks;

-my $backlinks_calculated=0;
+our %brokenlinks;
+my $links_calculated=0;

 
 

-sub calculate_backlinks () {
-       return if $backlinks_calculated;
-       %backlinks=();
+sub calculate_links () {
+       return if $links_calculated;
+       %backlinks=%brokenlinks=();

        foreach my $page (keys %links) {
                foreach my $link (@{$links{$page}}) {
                        my $bestlink=bestlink($page, $link);
        foreach my $page (keys %links) {
                foreach my $link (@{$links{$page}}) {
                        my $bestlink=bestlink($page, $link);

-                       if (length $bestlink && $bestlink ne $page) {
-                               $backlinks{$bestlink}{$page}=1;
+                       if (length $bestlink) {
+                               $backlinks{$bestlink}{$page}=1
+                                       if $bestlink ne $page;
+                       }
+                       else {
+                               push @{$brokenlinks{$link}}, $page;

                        }
                }
        }
                        }
                }
        }

-       $backlinks_calculated=1;
+       $links_calculated=1;

 }
 
 sub backlink_pages ($) {
        my $page=shift;
 
 }
 
 sub backlink_pages ($) {
        my $page=shift;
 

-       calculate_backlinks();
+       calculate_links();

 
        return keys %{$backlinks{$page}};
 }
 
        return keys %{$backlinks{$page}};
 }


@@ -205,6 +210,7 @@ sub render ($) {
        if (defined $type) {
                my $page=pagename($file);
                delete $depends{$page};
        if (defined $type) {
                my $page=pagename($file);
                delete $depends{$page};

+               delete $depends_simple{$page};

                will_render($page, htmlpage($page), 1);
                return if $type=~/^_/;
                
                will_render($page, htmlpage($page), 1);
                return if $type=~/^_/;
                


@@ -219,6 +225,7 @@ sub render ($) {
        }
        else {
                delete $depends{$file};
        }
        else {
                delete $depends{$file};

+               delete $depends_simple{$file};

                will_render($file, $file, 1);
                
                if ($config{hardlink}) {
                will_render($file, $file, 1);
                
                if ($config{hardlink}) {


@@ -335,7 +342,7 @@ sub refresh () {
        run_hooks(refresh => sub { shift->() });
        my ($files, $exists)=find_src_files();
 
        run_hooks(refresh => sub { shift->() });
        my ($files, $exists)=find_src_files();
 

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

        # check for added or removed pages
        foreach my $file (@$files) {
                my $page=pagename($file);
        # check for added or removed pages
        foreach my $file (@$files) {
                my $page=pagename($file);


@@ -400,7 +407,7 @@ sub refresh () {
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$stat[9];
                        if (isinternal($page)) {
                    $forcerebuild{$page}) {
                        $pagemtime{$page}=$stat[9];
                        if (isinternal($page)) {

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

                                # Preprocess internal page in scan-only mode.
                                preprocess($page, $page, readfile($srcfile), 1);
                        }
                                # Preprocess internal page in scan-only mode.
                                preprocess($page, $page, readfile($srcfile), 1);
                        }


@@ -416,16 +423,17 @@ sub refresh () {
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);
        }
                debug(sprintf(gettext("scanning %s"), $file));
                scan($file);
        }

-       calculate_backlinks();
+       calculate_links();

        foreach my $file (@needsbuild) {
                debug(sprintf(gettext("building %s"), $file));
                render($file);
                $rendered{$file}=1;
        }
        foreach my $file (@needsbuild) {
                debug(sprintf(gettext("building %s"), $file));
                render($file);
                $rendered{$file}=1;
        }

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

                # internal pages are not rendered
                my $page=pagename($file);
                delete $depends{$page};
                # internal pages are not rendered
                my $page=pagename($file);
                delete $depends{$page};

+               delete $depends_simple{$page};

                foreach my $old (@{$renderedfiles{$page}}) {
                        delete $destsources{$old};
                }
                foreach my $old (@{$renderedfiles{$page}}) {
                        delete $destsources{$old};
                }


@@ -446,28 +454,80 @@ sub refresh () {
                }
        }
 
                }
        }
 

-       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}) {
-                               # 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)) {
-                                               debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-                                               render($f);
-                                               $rendered{$f}=1;
-                                               last;
+       if (%rendered || @del || @internal || @internal_change) {
+               my @changed;
+               my $changes;
+               do {
+                       $changes=0;
+                       @changed=(keys %rendered, @del);
+                       my @exists_changed=(@add, @del);
+       
+                       my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+                       my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+        
+                       # rebuild dependant pages
+                       foreach my $f (@$files) {
+                               next if $rendered{$f};
+                               my $p=pagename($f);
+                               my $reason = undef;
+       
+                               if (exists $depends_simple{$p}) {
+                                       foreach my $d (keys %{$depends_simple{$p}}) {
+                                               if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
+                                                    exists $lc_changed{$d})
+                                                   ||
+                                                   ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_PRESENCE &&
+                                                    exists $lc_exists_changed{$d})) {
+                                                       $reason = $d;
+                                                       last;
+                                               }

                                        }
                                }
                                        }
                                }

+       
+                               if (exists $depends{$p} && ! defined $reason) {
+                                       D: foreach my $d (keys %{$depends{$p}}) {
+                                               my $sub=pagespec_translate($d);
+                                               next if $@ || ! defined $sub;
+       
+                                               my @candidates;
+                                               if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+                                                       @candidates=@changed;
+                                               }
+                                               elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+                                                       @candidates=@exists_changed;
+                                               }
+                                               # only consider internal files
+                                               # if the page explicitly depends
+                                               # on such files
+                                               if ($d =~ /internal\(/) {
+                                                       if ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT) {
+                                                               push @candidates, @internal, @internal_change;
+                                                       }
+                                                       elsif ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
+                                                               push @candidates, @internal;
+                                                       }
+                                               }
+       
+                                               foreach my $file (@candidates) {
+                                                       next if $file eq $f;
+                                                       my $page=pagename($file);
+                                                       if ($sub->($page, location => $p)) {
+                                                               $reason = $page;
+                                                               last D;
+                                                       }
+                                               }
+                                       }
+                               }
+       
+                               if (defined $reason) {
+                                       debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+                                       render($f);
+                                       $rendered{$f}=1;
+                                       $changes++;
+                                       last;
+                               }

                        }
                        }

-               }
+               } while $changes;

                
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to
                
                # handle backlinks; if a page has added/removed links,
                # update the pages it links to