From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 14:41:26 +0000 (+0100)
Subject: Auto-detect "simple dependencies" instead of requiring callers to use add_depends_exact()
X-Git-Tag: 3.1415926~17^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6992ec56629f4a893c7f016aaa81be25326356b;p=ikiwiki.git

Auto-detect "simple dependencies" instead of requiring callers to use add_depends_exact()
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f6a985556..e4fcf1d6f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,7 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  pagespec_match_list bestlink htmllink readfile writefile
 		 pagetype srcfile pagename displaytime will_render gettext urlto
 		 targetpage add_underlay pagetitle titlepage linkpage
-		 newpagefile inject add_link add_depends_exact
+		 newpagefile inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -1748,19 +1748,19 @@ sub add_depends ($$) {
 	my $page=shift;
 	my $pagespec=shift;
 
+	if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+		$pagespec !~ /[\s*?()!]/) {
+		# a simple dependency, which can be matched by string eq
+		$depends_exact{$page}{$pagespec} = 1;
+		return 1;
+	}
+
 	return unless pagespec_valid($pagespec);
 
 	$depends{$page}{$pagespec} = 1;
 	return 1;
 }
 
-sub add_depends_exact ($$) {
-	my $page = shift;
-	my $dep = shift;
-
-	$depends_exact{$page}{$dep} = 1;
-}
-
 sub file_pruned ($$) {
 	require File::Spec;
 	my $file=File::Spec->canonpath(shift);