From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Oct 2009 19:38:04 +0000 (-0400)
Subject: handle transitive dependencies by re-running dep resolver
X-Git-Tag: 3.20091017~27^2~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71eabd44d5749ec5000e4f32c8dfc19a16aef297;p=ikiwiki.git

handle transitive dependencies by re-running dep resolver

This is a rather expensive solution to the transitive dependency problem.
---

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 246c2260d..c58f33d68 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -455,50 +455,55 @@ sub refresh () {
 	}
 
 	if (%rendered || @del || @internal) {
-		my @changed=(keys %rendered, @del);
-
- 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
- 
-		# rebuild dependant pages
-		foreach my $f (@$files) {
-			next if $rendered{$f};
-			my $p=pagename($f);
-			my $reason = undef;
-
-			if (exists $depends_simple{$p}) {
-				foreach my $d (keys %{$depends_simple{$p}}) {
-					if (exists $lcchanged{$d}) {
-						$reason = $d;
-						last;
+		my @changed;
+		my $changes;
+		do {
+			$changes=0;
+			@changed=(keys %rendered, @del);
+	 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
+
+			# rebuild dependant pages
+			foreach my $f (@$files) {
+				next if $rendered{$f};
+				my $p=pagename($f);
+				my $reason = undef;
+	
+				if (exists $depends_simple{$p}) {
+					foreach my $d (keys %{$depends_simple{$p}}) {
+						if (exists $lcchanged{$d}) {
+							$reason = $d;
+							last;
+						}
 					}
 				}
-			}
-
-			if (exists $depends{$p} && ! defined $reason) {
-				D: foreach my $d (keys %{$depends{$p}}) {
-					my $sub=pagespec_translate($d);
-					next if $@ || ! defined $sub;
-
-					# only consider internal files
-					# if the page explicitly depends
-					# on such files
-					foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
-						next if $file eq $f;
-						my $page=pagename($file);
-						if ($sub->($page, location => $p)) {
-							$reason = $page;
-							last D;
+	
+				if (exists $depends{$p} && ! defined $reason) {
+					D: foreach my $d (keys %{$depends{$p}}) {
+						my $sub=pagespec_translate($d);
+						next if $@ || ! defined $sub;
+	
+						# only consider internal files
+						# if the page explicitly depends
+						# on such files
+						foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+							next if $file eq $f;
+							my $page=pagename($file);
+							if ($sub->($page, location => $p)) {
+								$reason = $page;
+								last D;
+							}
 						}
 					}
 				}
+	
+				if (defined $reason) {
+					debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+					render($f);
+					$rendered{$f}=1;
+					$changes++;
+				}
 			}
-
-			if (defined $reason) {
-				debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
-				render($f);
-				$rendered{$f}=1;
-			}
-		}
+		} while $changes;
 		
 		# handle backlinks; if a page has added/removed links,
 		# update the pages it links to