change how dependency types are specified to add_depends

Also, this fixes 2 bugs in dependency info.

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 9e65f52c656f55dd201c6b2abba6fd5f9419e3a8..62a0a42f4547c865f000d02d2e188987951037ec 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -24,7 +24,7 @@ sub preprocess (@) {
        $params{pages}="*" unless defined $params{pages};
        
        # Needs to update whenever the links on a page change.
-       add_depends($params{page}, $params{pages}, links => 1);
+       add_depends($params{page}, $params{pages}, deptype("links"));
        
        my @broken;
        foreach my $link (keys %IkiWiki::brokenlinks) {

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ec8e232e16e7b5775ce12733890b73373f8759e6..c99170f923c00a7db9d4ef2b97595b0f69862692 100644 (file)
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -105,21 +105,21 @@ sub format_month (@) {
                        linktext => " $monthname ");
        }
        add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month),
-               presence => 1);
+               deptype("presence"));
        if (exists $cache{$pagespec}{"$pyear/$pmonth"}) {
                $purl = htmllink($params{page}, $params{destpage}, 
                        "$archivebase/$pyear/" . sprintf("%02d", $pmonth),
                        linktext => " $pmonthname ");
        }
        add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth),
-               presence => 1);
+               deptype("presence"));
        if (exists $cache{$pagespec}{"$nyear/$nmonth"}) {
                $nurl = htmllink($params{page}, $params{destpage}, 
                        "$archivebase/$nyear/" . sprintf("%02d", $nmonth),
                        linktext => " $nmonthname ");
        }
        add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth),
-               presence => 1);
+               deptype("presence"));
 
        # Start producing the month calendar
        $calendar=<<EOF;
@@ -212,7 +212,7 @@ EOF
 
        # Add dependencies to update the calendar whenever pages
        # matching the pagespec are added or removed.
-       add_depends($params{page}, $params{pages}, presence => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence"));
 
        return $calendar;
 }
@@ -244,19 +244,19 @@ sub format_year (@) {
                        "$archivebase/$year",
                        linktext => "$year");
        }
-       add_depends($params{page}, "$archivebase/$year", presence => 1);
+       add_depends($params{page}, "$archivebase/$year", deptype("presence");
        if (exists $cache{$pagespec}{"$pyear"}) {
                $purl = htmllink($params{page}, $params{destpage}, 
                        "$archivebase/$pyear",
                        linktext => "\&larr;");
        }
-       add_depends($params{page}, "$archivebase/$pyear", presence => 1);
+       add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
        if (exists $cache{$pagespec}{"$nyear"}) {
                $nurl = htmllink($params{page}, $params{destpage}, 
                        "$archivebase/$nyear",
                        linktext => "\&rarr;");
        }
-       add_depends($params{page}, "$archivebase/$nyear", presence => 1);
+       add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
        # Start producing the year calendar
        $calendar=<<EOF;
@@ -308,7 +308,8 @@ EOF
                else {
                        $calendar.=qq{\t<td class="$tag">$monthabbr</td>\n};
                }
-               add_depends($params{page}, "$archivebase/$year/$mtag", presence => 1);
+               add_depends($params{page}, "$archivebase/$year/$mtag",
+                       deptype("presence"));
 
                $calendar.=qq{\t</tr>\n} if ($month % $params{months_per_row} == 0);
        }

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 2dd1dbe682c2567e4bf879e0708e0ea9e2fcb8c0..7d2eba194537857cb1088a90e2a4afa82009b507 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -58,7 +58,7 @@ sub preprocess (@) {
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
        return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-       add_depends($params{page}, $link, presence => 1);
+       add_depends($params{page}, $link, deptype("presence"));
        return sprintf(gettext("edittemplate %s registered for %s"),
                htmllink($params{page}, $params{destpage}, $link),
                $params{match});

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fc4e00a838d331f3b0c66fa33e3802d33d8f4f18..be1781520d63029972d05961230f4f230db17634 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,9 +195,14 @@ sub preprocess_inline (@) {
 
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};
+
+               foreach my $p (@list) {
+                       add_depends($params{page}, $p, deptype($quick ? "presence" : "content"));
+               }
        }
        else {
-               add_depends($params{page}, $params{pages}, presence => $quick);
+               add_depends($params{page}, $params{pages},
+                       deptype($quick ? "presence" : "content"));
 
                @list = pagespec_match_list(
                        [ grep { $_ ne $params{page} } keys %pagesources ],

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 3d20a65212ac7904f5b19aea0d2eb642ddaf1781..28e4cfa13745003b0358f8ad7d8a565dbbfae057 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -30,7 +30,7 @@ sub preprocess (@) {
        
        # Needs to update whenever a relevant page is added, or removed, or
        # its links change.
-       add_depends($params{page}, $params{pages}, presence => 1, links => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence", "links"));
        
        # Can't just return the linkmap here, since the htmlscrubber
        # scrubs out all <object> tags (with good reason!)

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 4023ed7d75fd4b2582b7fe00265a5ac6a449619c..09f08c5671ad82a7562a558342723669e5614641 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -84,7 +84,7 @@ sub preprocess (@) {
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
                my $link=linkpage($config{directive_description_dir}."/".$plugin);
-               add_depends($params{page}, $link, presence => 1);
+               add_depends($params{page}, $link, deptype("presence"));
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 46f11dc8948ea66b63a72e65b2e6d34910b45fc4..19872e51cafe24973ee98217c06050b463715b41 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -70,7 +70,8 @@ sub preprocess (@) {
        # Needs to update whenever a page is added or removed (or in some
        # cases, when its content changes, if show= is specified), so
        # register a dependency.
-       add_depends($params{page}, $params{pages}, presence => ! exists $params{show});
+       add_depends($params{page}, $params{pages},
+               deptype(exists $params{show} ? "content" : "presence");
 
        # Create the map.
        my $parent="";

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index da3e6223311e1f6a3a4808409fb2a93af2d38e63..c675880b3c48b5fd7228b4892b42cd7e8346d9fc 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -195,7 +195,7 @@ sub preprocess (@) {
                        if (! length $link) {
                                error gettext("redir page not found")
                        }
-                       add_depends($page, $link, presence => 1);
+                       add_depends($page, $link, deptype("presence"));
 
                        $value=urlto($link, $page);
                        $value.='#'.$redir_anchor if defined $redir_anchor;

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index ae330b23b81e78abf227cbcb0a5cb757088e485a..93b8ec440670d06b7eb198ec8be933c4adfc5fee 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -26,10 +26,10 @@ sub preprocess (@) {
        # Needs to update whenever a link changes, on any page
        # since any page could link to one of the pages we're
        # considering as orphans.
-       add_depends($params{page}, "*", links => 1);
+       add_depends($params{page}, "*", deptype("links"));
        # Also needs to update whenever potential orphans are added or
        # removed.
-       add_depends($params{page}, $params{pages}, presence => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence"));
        
        my @orphans;
        foreach my $page (pagespec_match_list(

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 80561350b5fe44d7d282fb5fac6b5c9ac8e295ea..419f2d535ec6fbe5cb32a8a09173bfd4378bc827 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -24,7 +24,7 @@ sub preprocess (@) {
        
        # Needs to update count whenever a page is added or removed, so
        # register a presence dependency.
-       add_depends($params{page}, $params{pages}, presence => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence"));
        
        my @pages;
        if ($params{pages} eq "*") {

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index afe4eeaf2e4b69855600ac5972e219292d1d2af4..cd0bdb08520e14f02c26a4be01bd4b558e0b0539 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -36,12 +36,12 @@ sub preprocess (@) {
        my $style = ($params{style} or 'cloud');
        
        # Needs to update whenever a page is added or removed.
-       add_depends($params{page}, $params{pages}, exists => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence"));
        # Also needs to update when any page with links changes, 
        # in case the links point to our displayed pages.
        # (Among limits this further.)
        add_depends($params{page}, exists $params{among} ? $params{among} : "*",
-               links => 1); 
+               deptype("links")); 
        
        my %counts;
        my $max = 0;

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 3205958d40dcb5f8b0a510b58d14fba95423c1ff..ea73e9180e945f8c95794c91eec93a9202cf7694 100644 (file)
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -48,7 +48,7 @@ sub preprocess (@) {
                error gettext("unknown formula");
        }
 
-       add_depends($params{page}, $params{pages}, presence => 1);
+       add_depends($params{page}, $params{pages}, deptype("presence"));
 
        my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
                pagespec_match_list(

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 26c537a84022ae51001beb9be86db90b1da25e0a..6da3e4f7150c3bb94bf01107bc91d847c6587ef8 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,8 +36,8 @@ sub preprocess (@) {
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
-               add_depends($params{page}, $params{totalpages}, presence => 1);
-               add_depends($params{page}, $params{donepages}, presence => 1);
+               add_depends($params{page}, $params{totalpages}, deptype("presence"));
+               add_depends($params{page}, $params{donepages}, deptype("presence"));
 
                my @pages=keys %pagesources;
                my $totalcount=0;