X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/7227c2debfeef94b35f7d81f42900aa01820caa3..2a7f3b91d4fa46a67d04f963785f957563ac0cfc:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index b9f1d7754..5367b1309 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -210,6 +210,7 @@ sub render ($) { if (defined $type) { my $page=pagename($file); delete $depends{$page}; + delete $depends_exact{$page}; will_render($page, htmlpage($page), 1); return if $type=~/^_/; @@ -224,6 +225,7 @@ sub render ($) { } else { delete $depends{$file}; + delete $depends_exact{$file}; will_render($file, $file, 1); if ($config{hardlink}) { @@ -431,6 +433,7 @@ sub refresh () { # internal pages are not rendered my $page=pagename($file); delete $depends{$page}; + delete $depends_exact{$page}; foreach my $old (@{$renderedfiles{$page}}) { delete $destsources{$old}; } @@ -454,18 +457,36 @@ sub refresh () { if (%rendered || @del || @internal) { my @changed=(keys %rendered, @del); + my %lcchanged = map { lc(pagename($_)) => 1 } @changed; + # rebuild dependant pages F: foreach my $f (@$files) { next if $rendered{$f}; my $p=pagename($f); + + if (exists $depends_exact{$p}) { + foreach my $d (keys %{$depends_exact{$p}}) { + if (exists $lcchanged{$d}) { + debug(sprintf(gettext("building %s, which depends on %s"), $f, $d)); + render($f); + $rendered{$f}=1; + next F; + } + } + } + if (exists $depends{$p}) { foreach my $d (keys %{$depends{$p}}) { + my $sub=pagespec_translate($d); + next if $@ || ! defined $sub; + # only consider internal files - # if the page explicitly depends on such files - foreach my $file (@changed, $d=~/internal\(/ ? @internal : ()) { - next if $f eq $file; + # if the page explicitly depends + # on such files + foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) { + next if $file eq $f; my $page=pagename($file); - if (pagespec_match($page, $d, location => $p)) { + if ($sub->($page, location => $p)) { debug(sprintf(gettext("building %s, which depends on %s"), $f, $page)); render($f); $rendered{$f}=1;