From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 31 Jul 2009 08:12:23 +0000 (+0200)
Subject: Merge commit 'remotes/smcv/ready/among'
X-Git-Tag: 3.15~73
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d27dac8098957024b8e4c6ee815536fe81e8d18?ds=inline;hp=-c

Merge commit 'remotes/smcv/ready/among'
---

3d27dac8098957024b8e4c6ee815536fe81e8d18
diff --combined IkiWiki/Render.pm
index bed9cb777,6900d5eed..5cb67ea07
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@@ -24,13 -24,19 +24,19 @@@ sub calculate_backlinks () 
  	$backlinks_calculated=1;
  }
  
- sub backlinks ($) {
+ sub backlink_pages ($) {
  	my $page=shift;
  
  	calculate_backlinks();
  
+ 	return keys %{$backlinks{$page}};
+ }
+ 
+ sub backlinks ($) {
+ 	my $page=shift;
+ 
  	my @links;
- 	foreach my $p (keys %{$backlinks{$page}}) {
+ 	foreach my $p (backlink_pages($page)) {
  		my $href=urlto($p, $page);
                  
  		# Trim common dir prefixes from both pages.
@@@ -246,7 -252,7 +252,7 @@@ sub prune ($) 
  	}
  }
  
 -sub refresh () {
 +sub srcdir_check () {
  	# security check, avoid following symlinks in the srcdir path by default
  	my $test=$config{srcdir};
  	while (length $test) {
@@@ -258,10 -264,11 +264,10 @@@
  		}
  	}
  	
 -	run_hooks(refresh => sub { shift->() });
 +}
  
 -	# find existing pages
 -	my %exists;
 -	my @files;
 +sub find_src_files () {
 +	my (@files, %pages);
  	eval q{use File::Find};
  	error($@) if $@;
  	find({
@@@ -280,10 -287,10 +286,10 @@@
  					$f=~s/^\Q$config{srcdir}\E\/?//;
  					push @files, $f;
  					my $pagename = pagename($f);
 -					if ($exists{$pagename}) {
 +					if ($pages{$pagename}) {
  						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
  					}
 -					$exists{$pagename}=1;
 +					$pages{$pagename}=1;
  				}
  			}
  		},
@@@ -309,9 -316,9 +315,9 @@@
  						if (! -l "$config{srcdir}/$f" && 
  						    ! -e _) {
  						    	my $page=pagename($f);
 -							if (! $exists{$page}) {
 +							if (! $pages{$page}) {
  								push @files, $f;
 -								$exists{$page}=1;
 +								$pages{$page}=1;
  							}
  						}
  					}
@@@ -320,19 -327,9 +326,19 @@@
  		}, $dir);
  	};
  
 +	# Returns a list of all source files found, and a hash of 
 +	# the corresponding page names.
 +	return \@files, \%pages;
 +}
 +
 +sub refresh () {
 +	srcdir_check();
 +	run_hooks(refresh => sub { shift->() });
 +	my ($files, $exists)=find_src_files();
 +
  	my (%rendered, @add, @del, @internal);
  	# check for added or removed pages
 -	foreach my $file (@files) {
 +	foreach my $file (@$files) {
  		my $page=pagename($file);
  		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
  			# the page has changed its type
@@@ -362,7 -359,7 +368,7 @@@
  		}
  	}
  	foreach my $page (keys %pagemtime) {
 -		if (! $exists{$page}) {
 +		if (! $exists->{$page}) {
  			if (isinternal($page)) {
  				push @internal, $pagesources{$page};
  			}
@@@ -386,7 -383,7 +392,7 @@@
  
  	# find changed and new files
  	my @needsbuild;
 -	foreach my $file (@files) {
 +	foreach my $file (@$files) {
  		my $page=pagename($file);
  		my ($srcfile, @stat)=srcfile_stat($file);
  		if (! exists $pagemtime{$page} ||
@@@ -412,7 -409,7 +418,7 @@@
  	}
  	calculate_backlinks();
  	foreach my $file (@needsbuild) {
 -		debug(sprintf(gettext("rendering %s"), $file));
 +		debug(sprintf(gettext("building %s"), $file));
  		render($file);
  		$rendered{$file}=1;
  	}
@@@ -433,7 -430,7 +439,7 @@@
  			foreach my $page (keys %{$backlinks{$p}}) {
  				my $file=$pagesources{$page};
  				next if $rendered{$file};
 -		   		debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));
 +		   		debug(sprintf(gettext("building %s, which links to %s"), $file, $p));
  				render($file);
  				$rendered{$file}=1;
  			}
@@@ -444,7 -441,7 +450,7 @@@
  		my @changed=(keys %rendered, @del);
  
  		# rebuild dependant pages
 -		foreach my $f (@files) {
 +		foreach my $f (@$files) {
  			next if $rendered{$f};
  			my $p=pagename($f);
  			if (exists $depends{$p}) {
@@@ -454,7 -451,7 +460,7 @@@
  					next if $f eq $file;
  					my $page=pagename($file);
  					if (pagespec_match($page, $depends{$p}, location => $p)) {
 -						debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
 +						debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
  						render($f);
  						$rendered{$f}=1;
  						last;
@@@ -493,7 -490,7 +499,7 @@@
  		    	my $linkfile=$pagesources{$link};
  			if (defined $linkfile) {
  				next if $rendered{$linkfile};
 -				debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile));
 +				debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile));
  				render($linkfile);
  				$rendered{$linkfile}=1;
  			}
@@@ -505,7 -502,7 +511,7 @@@
  		my $page=pagename($src);
  		foreach my $file (@{$oldrenderedfiles{$page}}) {
  			if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
 -				debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page));
 +				debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page));
  				prune($config{destdir}."/".$file);
  			}
  		}
@@@ -529,7 -526,7 +535,7 @@@ sub commandline_render () 
  	$file=~s/\Q$config{srcdir}\E\/?//;
  
  	my $type=pagetype($file);
 -	die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type;
 +	die sprintf(gettext("ikiwiki: cannot build %s"), $srcfile)."\n" unless defined $type;
  	my $content=readfile($srcfile);
  	my $page=pagename($file);
  	$pagesources{$page}=$file;