From 7dd9b65db4dae3aca473f15ea7dcdbf88c8acb1b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2009 17:46:15 -0400 Subject: [PATCH] don't use pagespec_match_list This should be more efficient than pagespec_match_list since it short-circuits after the first match is found. The other problem with using pagespec_match_list here is it may throw an error if a bad or failing pagespec somehow got into the dependencies. --- IkiWiki/Render.pm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index fb28b6e3b..da2d7b4cc 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -460,19 +460,21 @@ sub refresh () { my $p=pagename($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 - my @pages = map { - pagename($_) - } grep { - $_ ne $f - } (@changed, $d =~ /internal\(/ ? @internal : ()); - @pages = pagespec_match_list(\@pages, $d, location => $p); - if (@pages) { - debug(sprintf(gettext("building %s, which depends on %s"), $f, $pages[0])); - render($f); - $rendered{$f}=1; - next F; + # 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 ($sub->($page, location => $p)) { + debug(sprintf(gettext("building %s, which depends on %s"), $f, $page)); + render($f); + $rendered{$f}=1; + next F; + } } } } -- 2.32.0.93.g670b81a890