X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FRender.pm;h=9e00428c2127376182a304bdb34c4f8383b04880;hb=d5357374c9def3cee23d46595f61795e08f4cc0b;hp=5367b13092f58f45cb92e116caced874fbf4be96;hpb=2a7f3b91d4fa46a67d04f963785f957563ac0cfc;p=ikiwiki.git

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5367b1309..9e00428c2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -210,7 +210,7 @@ sub render ($) {
 	if (defined $type) {
 		my $page=pagename($file);
 		delete $depends{$page};
-		delete $depends_exact{$page};
+		delete $depends_simple{$page};
 		will_render($page, htmlpage($page), 1);
 		return if $type=~/^_/;
 		
@@ -225,7 +225,7 @@ sub render ($) {
 	}
 	else {
 		delete $depends{$file};
-		delete $depends_exact{$file};
+		delete $depends_simple{$file};
 		will_render($file, $file, 1);
 		
 		if ($config{hardlink}) {
@@ -342,7 +342,7 @@ sub refresh () {
 	run_hooks(refresh => sub { shift->() });
 	my ($files, $exists)=find_src_files();
 
-	my (%rendered, @add, @del, @internal);
+	my (%rendered, @add, @del, @internal, @internal_change);
 	# check for added or removed pages
 	foreach my $file (@$files) {
 		my $page=pagename($file);
@@ -407,7 +407,7 @@ sub refresh () {
 	    	    $forcerebuild{$page}) {
 			$pagemtime{$page}=$stat[9];
 			if (isinternal($page)) {
-				push @internal, $file;
+				push @internal_change, $file;
 				# Preprocess internal page in scan-only mode.
 				preprocess($page, $page, readfile($srcfile), 1);
 			}
@@ -429,11 +429,11 @@ sub refresh () {
 		render($file);
 		$rendered{$file}=1;
 	}
-	foreach my $file (@internal) {
+	foreach my $file (@internal, @internal_change) {
 		# internal pages are not rendered
 		my $page=pagename($file);
 		delete $depends{$page};
-		delete $depends_exact{$page};
+		delete $depends_simple{$page};
 		foreach my $old (@{$renderedfiles{$page}}) {
 			delete $destsources{$old};
 		}
@@ -454,47 +454,74 @@ sub refresh () {
 		}
 	}
 
-	if (%rendered || @del || @internal) {
+	if (%rendered || @del || @internal || @internal_change) {
 		my @changed=(keys %rendered, @del);
+		my @exists_changed=(@add, @del);
 
- 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
+		my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
+		my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
  
 		# rebuild dependant pages
-		F: foreach my $f (@$files) {
+		foreach my $f (@$files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
-
-			if (exists $depends_exact{$p}) {
-				foreach my $d (keys %{$depends_exact{$p}}) {
-					if (exists $lcchanged{$d}) {
-						debug(sprintf(gettext("building %s, which depends on %s"), $f, $d));
-						render($f);
-						$rendered{$f}=1;
-						next F;
+			my $reason = undef;
+
+			if (exists $depends_simple{$p}) {
+				foreach my $d (keys %{$depends_simple{$p}}) {
+					if ($depends_simple{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+						if (exists $lc_exists_changed{$d}) {
+							$reason = $d;
+							last;
+						}
+					}
+					elsif (exists $lc_changed{$d}) {
+						$reason = $d;
+						last;
 					}
 				}
 			}
 
-			if (exists $depends{$p}) {
-				foreach my $d (keys %{$depends{$p}}) {
+			if (exists $depends{$p} && ! defined $reason) {
+				D: foreach my $d (keys %{$depends{$p}}) {
 					my $sub=pagespec_translate($d);
 					next if $@ || ! defined $sub;
 
+					my @candidates;
+					if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+						@candidates=@exists_changed;
+					}
+					else {
+						@candidates=@changed;
+					}
 					# only consider internal files
 					# if the page explicitly depends
 					# on such files
-					foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+					if ($d =~ /internal\(/) {
+						if ($depends{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
+							push @candidates, @internal;
+						}
+						else {
+							push @candidates, @internal, @internal_change;
+						}
+					}
+
+					foreach my $file (@candidates) {
 						next if $file eq $f;
 						my $page=pagename($file);
 						if ($sub->($page, location => $p)) {
-							debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
-							render($f);
-							$rendered{$f}=1;
-							next F;
+							$reason = $page;
+							last D;
 						}
 					}
 				}
 			}
+
+			if (defined $reason) {
+				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+				render($f);
+				$rendered{$f}=1;
+			}
 		}
 		
 		# handle backlinks; if a page has added/removed links,