From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 21:21:19 +0000 (-0400)
Subject: Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
X-Git-Tag: 3.1415926~65
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b3d65aee1822cce5d8612f05c972d8db32721bee?ds=inline;hp=-c

Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
---

b3d65aee1822cce5d8612f05c972d8db32721bee
diff --combined IkiWiki.pm
index 871170992,06a0b7a2c..5563a03af
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -1738,6 -1738,15 +1738,6 @@@ sub add_depends ($$) 
  	my $page=shift;
  	my $pagespec=shift;
  
 -	if (ref $pagespec eq 'ARRAY') {
 -		foreach my $ps (@$pagespec) {
 -			if (pagespec_valid($ps)) {
 -				$depends{$page}{$ps} = 1;
 -			}
 -		}
 -		return;
 -	}
 -
  	return unless pagespec_valid($pagespec);
  
  	$depends{$page}{$pagespec} = 1;
@@@ -1824,14 -1833,6 +1824,6 @@@ sub add_link ($$) 
  		unless grep { $_ eq $link } @{$links{$page}};
  }
  
- sub pagespec_merge ($$) {
- 	my $a=shift;
- 	my $b=shift;
- 
- 	return $a if $a eq $b;
- 	return "($a) or ($b)";
- }
- 
  sub pagespec_translate ($) {
  	my $spec=shift;