diff options
| -rw-r--r-- | IkiWiki/Render.pm | 117 |
1 files changed, 62 insertions, 55 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 9e00428c2..3fc750925 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -455,74 +455,81 @@ sub refresh () { } if (%rendered || @del || @internal || @internal_change) { - my @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_EXISTS) { - if (exists $lc_exists_changed{$d}) { + 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_EXISTS) { + if (exists $lc_exists_changed{$d}) { + $reason = $d; + last; + } + } + elsif (exists $lc_changed{$d}) { $reason = $d; last; } } - elsif (exists $lc_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{$p}{$d} == $IkiWiki::DEPEND_EXISTS) { - @candidates=@exists_changed; - } - else { - @candidates=@changed; - } - # only consider internal files - # if the page explicitly depends - # on such files - if ($d =~ /internal\(/) { + + 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{$p}{$d} == $IkiWiki::DEPEND_EXISTS) { - push @candidates, @internal; + @candidates=@exists_changed; } else { - push @candidates, @internal, @internal_change; + @candidates=@changed; } - } - - foreach my $file (@candidates) { - next if $file eq $f; - my $page=pagename($file); - if ($sub->($page, location => $p)) { - $reason = $page; - last D; + # only consider internal files + # if the page explicitly depends + # on such files + if ($d =~ /internal\(/) { + if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) { + push @candidates, @internal; + } + else { + push @candidates, @internal, @internal_change; + } + } + + 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; + } } - - if (defined $reason) { - debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason)); - render($f); - $rendered{$f}=1; - } - } + } while $changes; # handle backlinks; if a page has added/removed links, # update the pages it links to |