X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/034b4e826627dddf47ff27278897804e39741e57..39d4bfde6b9c49f0a8b13699be701bda11eb851a:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 14f6f9d5f..8ae0cbd4f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -74,7 +74,16 @@ sub genpage ($$) {
 			$templatefile=$file;
 		}
 	});
-	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
+	my $template;
+	if (defined $templatefile) {
+		$template=template_depends($templatefile, $page,
+			blind_cache => 1);
+	}
+	else {
+		# no explicit depends as special case
+		$template=template('page.tmpl', 
+			blind_cache => 1);
+	}
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
@@ -517,7 +526,7 @@ sub link_types_changed ($$) {
 	my $old = shift;
 
 	return 0 if !defined $new && !defined $old;
-	return 1 if !defined $new || !defined $old;
+	return 1 if (!defined $new && %$old) || (!defined $old && %$new);
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
@@ -681,28 +690,36 @@ sub gen_autofile ($$$) {
 	my $autofile=shift;
 	my $pages=shift;
 	my $del=shift;
-	
-	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+
+	if (file_pruned($autofile)) {
 		return;
 	}
-	
-	my $file="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $file || -l $file || -d _ || -e _) {
+
+	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file) {
 		return;
 	}
 
-	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+	# Remember autofiles that were tried, and never try them again later.
+	if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
+		return;
+	}
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
+
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
 		return;
 	}
 	
+	if (-l $file || -d _ || -e _) {
+		return;
+	}
+
 	my $page = pagename($file);
 	if ($pages->{$page}) {
 		return;
 	}
 
-	if (grep { $_ eq $file } @$del) {
-		$wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted}=1;
+	if (grep { $_ eq $autofile } @$del) {
 		return;
 	}
 
@@ -753,8 +770,14 @@ sub refresh () {
 	foreach my $file (@$new, @$del) {
 		render_linkers($file);
 	}
-	
-	if (@$changed || @$internal_changed ||
+
+	if ($rendered{"templates/page.tmpl"}) {
+		foreach my $f (@$files) {
+			next if $f eq "templates/page.tmpl";
+			render($f, sprintf(gettext("building %s, which depends on %s"), $f, "templates/page.tmpl"));
+		}
+	}
+	elsif (@$changed || @$internal_changed ||
 	    @$del || @$internal_del || @$internal_new) {
 		1 while render_dependent($files, $new, $internal_new,
 			$del, $internal_del, $internal_changed,