From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Oct 2009 20:33:58 +0000 (-0400)
Subject: Merge branch 'dependency-types' into transitive-dependencies
X-Git-Tag: 3.20091017~27^2~130
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9403045b7e48c4bae109bf7c2d1855c8769e2071?ds=inline;hp=-c

Merge branch 'dependency-types' into transitive-dependencies

Conflicts:
	IkiWiki/Render.pm
---

9403045b7e48c4bae109bf7c2d1855c8769e2071
diff --combined IkiWiki/Render.pm
index 09b646f75,9e00428c2..3fc750925
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@@ -342,7 -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 +407,7 @@@
  	    	    $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,7 -429,7 +429,7 @@@
  		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};
@@@ -454,57 -454,75 +454,82 @@@
  		}
  	}
  
- 	if (%rendered || @del || @internal) {
+ 	if (%rendered || @del || @internal || @internal_change) {
 -		my @changed=(keys %rendered, @del);
 -		my @exists_changed=(@add, @del);
 -
 -		my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 -		my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_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 ($depends_simple{$p}{$d} == $IkiWiki::DEPEND_EXISTS) {
 -						if (exists $lc_exists_changed{$d}) {
 +		my @changed;
 +		my $changes;
 +		do {
 +			$changes=0;
 +			@changed=(keys %rendered, @del);
- 	 		my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
- 
++			my @exists_changed=(@add, @del);
++	
++			my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
++			my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_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}) {
++						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;
  						}
  					}
 -					elsif (exists $lc_changed{$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;
 -
 -					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
 -					if ($d =~ /internal\(/) {
 +	
 +				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) {
 -							push @candidates, @internal;
++							@candidates=@exists_changed;
+ 						}
+ 						else {
 -							push @candidates, @internal, @internal_change;
++							@candidates=@changed;
+ 						}
 -					}
 -
 -					foreach my $file (@candidates) {
 -						next if $file eq $f;
 -						my $page=pagename($file);
 -						if ($sub->($page, location => $p)) {
 -							$reason = $page;
 -							last D;
 +						# 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)) {
 +								$reason = $page;
 +								last D;
 +							}
  						}
  					}
  				}
 +	
 +				if (defined $reason) {
 +					debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
 +					render($f);
 +					$rendered{$f}=1;
 +					$changes++;
 +					last;
 +				}
  			}
 -
 -			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