}
}
- if (%rendered || @del || @internal) {
+ 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 %lcchanged = map { lc(pagename($_)) => 1 } @changed;
-
++ 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 (exists $lcchanged{$d}) {
++ 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
- foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
++ 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;
+ }
}
}
}