calendar, inline, map: don't pre-join dependencies

The new dependency handling works better (eliminates more duplicates) if
dependencies are split up. On the same wiki mentioned in the previous
commit, this saves about a second (i.e. 4%) on the same test.

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index fe4b16072131eea5571a86d75c65a7a117bb3efc..60ef020ccf408a9db9f5361c76846c1991ff481d 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -212,7 +212,9 @@ EOF
        add_depends($params{page}, $params{pages});
        # Explicitly add all currently linked pages as dependencies, so
         # that if they are removed, the calendar will be sure to be updated.
-        add_depends($params{page}, join(" or ", @list));
+       foreach my $p (@list) {
+               add_depends($params{page}, $p);
+       }
 
        return $calendar;
 }

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 9d5ebc34daaeb6aa942f41b1424ece4ba00c9036..6f63b15870e267c30826496e28227ec6b3c2c402 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -234,7 +234,9 @@ sub preprocess_inline (@) {
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
-       add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
+       foreach my $p ($#list >= $#feedlist ? @list : @feedlist) {
+               add_depends($params{page}, $p);
+       }
        
        if ($feeds && exists $params{feedpages}) {
                @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 120451b5dbde60a26ae165e391cf56232cc30111..e932932f3ba0eeefe99b379189aa3ba870675647 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -73,7 +73,9 @@ sub preprocess (@) {
        add_depends($params{page}, $params{pages});
        # Explicitly add all currently shown pages, to detect when pages
        # are removed.
-       add_depends($params{page}, join(" or ", keys %mapitems));
+       foreach my $item (keys %mapitems) {
+               add_depends($params{page}, $item);
+       }
 
        # Create the map.
        my $parent="";