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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f6a985556bec162c46eb6fdea84abd9ea6c7e67f..e4fcf1d6fed4e90829a1db3f410d55061778d55e 100644 (file)
--- 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
                  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
                  %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;
 
        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;
 }
 
        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);
 sub file_pruned ($$) {
        require File::Spec;
        my $file=File::Spec->canonpath(shift);