From c57908b9d073500608d656adaf2bd3048c8cef67 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 16:49:03 -0400
Subject: change how dependency types are specified to add_depends

Also, this fixes 2 bugs in dependency info.
---
 IkiWiki/Plugin/brokenlinks.pm    |  2 +-
 IkiWiki/Plugin/calendar.pm       | 17 +++++++++--------
 IkiWiki/Plugin/edittemplate.pm   |  2 +-
 IkiWiki/Plugin/inline.pm         |  7 ++++++-
 IkiWiki/Plugin/linkmap.pm        |  2 +-
 IkiWiki/Plugin/listdirectives.pm |  2 +-
 IkiWiki/Plugin/map.pm            |  3 ++-
 IkiWiki/Plugin/meta.pm           |  2 +-
 IkiWiki/Plugin/orphans.pm        |  4 ++--
 IkiWiki/Plugin/pagecount.pm      |  2 +-
 IkiWiki/Plugin/pagestats.pm      |  4 ++--
 IkiWiki/Plugin/postsparkline.pm  |  2 +-
 IkiWiki/Plugin/progress.pm       |  4 ++--
 13 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index 9e65f52c6..62a0a42f4 100644
--- 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 ec8e232e1..c99170f92 100644
--- 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 2dd1dbe68..7d2eba194 100644
--- 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 fc4e00a83..be1781520 100644
--- 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 3d20a6521..28e4cfa13 100644
--- 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 4023ed7d7..09f08c567 100644
--- 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 46f11dc89..19872e51c 100644
--- 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 da3e62233..c675880b3 100644
--- 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 ae330b23b..93b8ec440 100644
--- 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 80561350b..419f2d535 100644
--- 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 afe4eeaf2..cd0bdb085 100644
--- 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 3205958d4..ea73e9180 100644
--- 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 26c537a84..6da3e4f71 100644
--- 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;
-- 
cgit v1.2.3