From c72fda7d695142cc29ac986125234140f6414d97 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 19:40:44 -0400
Subject: make success and failreason objects carry an influences hash

The hash will be used used to record a set of pages that influenced the
result of a pagespec match.

The influences are merged together when boolean and/or are encountered
in a pagespec. That means using a non-short-circuiting OR operator. And
so I use & and | when translating pagespecs, since those bitwise operators
can be overloaded. ("and" and "or" cannot, apparently).
---
 t/pagespec_match.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 't/pagespec_match.t')

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 64408f489..a1fcba7c8 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 54;
+use Test::More tests => 56;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -88,3 +88,7 @@ ok(! pagespec_match("foo", "no_such_function(foo)"), "foo");
 my $ret=pagespec_match("foo", "(invalid");
 ok(! $ret, "syntax error");
 ok($ret =~ /syntax error/, "error message");
+
+my $ret=pagespec_match("foo", "bar or foo");
+ok($ret, "simple match");
+is($ret, "foo matches foo", "stringified return");
-- 
cgit v1.2.3


From 4002d7c1a4657e769b036c6e76106991ec5c3897 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 20:31:13 -0400
Subject: add influence info to match_*

Also update docs, test suite.
---
 IkiWiki.pm             | 24 ++++++++++++------------
 IkiWiki/Plugin/meta.pm |  8 ++++----
 debian/changelog       |  2 ++
 doc/plugins/write.mdwn |  7 +++++++
 t/pagespec_match.t     | 15 +++++++++++++--
 5 files changed, 38 insertions(+), 18 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 73d2a9763..9c386e154 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2039,7 +2039,7 @@ use overload (
 sub new {
 	my $class = shift;
 	my $value = shift;
-	return bless [$value, {@_}], $class;
+	return bless [$value, {map { $_ => 1 } @_}], $class;
 }
 
 sub influences {
@@ -2099,23 +2099,23 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
+	return IkiWiki::FailReason->new("$page has no links", $link) unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link")
+			return IkiWiki::SuccessReason->new("$page links to $link", $page)
 				if $bestlink eq IkiWiki::bestlink($page, $p);
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page)
 				if match_glob($p, $link, %params);
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page)
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link");
+	return IkiWiki::FailReason->new("$page does not link to $link", $page);
 }
 
 sub match_backlink ($$;@) {
@@ -2131,14 +2131,14 @@ sub match_created_before ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created before $testpage");
+			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created before $testpage");
+			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist");
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
 	}
 }
 
@@ -2151,14 +2151,14 @@ sub match_created_after ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created after $testpage");
+			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created after $testpage");
+			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist");
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
 	}
 }
 
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 9b041a748..a8ee5bc85 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -291,21 +291,21 @@ sub match {
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page");
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page");
+			return IkiWiki::FailReason->new("$re does not match $field of $page", $page);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field");
+		return IkiWiki::FailReason->new("$page does not have a $field", $page);
 	}
 }
 
 package IkiWiki::PageSpec;
 
 sub match_title ($$;@) {
-	IkiWiki::Plugin::meta::match("title", @_);	
+	IkiWiki::Plugin::meta::match("title", @_);
 }
 
 sub match_author ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index dc6ee0a81..565a0cffa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low
   * Transitive dependencies are now correctly supported.
   * Rebuild wikis on upgrade to this version to get improved dependency
     info.
+  * Plugins providing PageSpec `match_*` functions should pass additional
+    influence information when creating result objects.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Sep 2009 17:40:03 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 8e8c3311e..6b47033e5 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,6 +982,13 @@ an IkiWiki::FailReason object if the match fails. If the match cannot be
 attempted at all, for any page, it can instead return an
 IkiWiki::ErrorReason object explaining why.
 
+When constructing these objects, you should also include a list of any
+pages whose contents or other metadata influenced the result of the match.
+For example, "backlink(foo)" is influenced by the contents of page foo;
+"link(foo)" and "title(bar)" are influenced by the contents of any
+page they match; "created_before(foo)" is influenced by the metadata of
+foo; while "glob(*)" is not influenced by the contents of any page.
+
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index a1fcba7c8..f73bfdfe1 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 56;
+use Test::More tests => 61;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -89,6 +89,17 @@ my $ret=pagespec_match("foo", "(invalid");
 ok(! $ret, "syntax error");
 ok($ret =~ /syntax error/, "error message");
 
-my $ret=pagespec_match("foo", "bar or foo");
+$ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
+
+$ret=pagespec_match("foo", "link(bar)");
+is(join(",", $ret->influences), 'foo', "link is influenced by the page with the link");
+$ret=pagespec_match("bar", "backlink(foo)");
+is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
+$ret=pagespec_match("bar", "backlink(foo)");
+is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
+$ret=pagespec_match("bar", "created_before(foo)");
+is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
+$ret=pagespec_match("bar", "created_after(foo)");
+is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
-- 
cgit v1.2.3


From 54fb82a5a47078f6865ed5bf7d7c09db4bf34e22 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 20:35:26 -0400
Subject: more influences tests

---
 t/pagespec_match.t | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 't/pagespec_match.t')

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index f73bfdfe1..1a0db1cef 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 61;
+use Test::More tests => 64;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -103,3 +103,9 @@ $ret=pagespec_match("bar", "created_before(foo)");
 is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
 $ret=pagespec_match("bar", "created_after(foo)");
 is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
+$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences add up over AND");
+$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences add up over OR");
+$ret=pagespec_match("bar", "!link(quux) and !created_after(foo)");
+is(join(",", sort $ret->influences), 'foo,quux', "influences unaffected by negation");
-- 
cgit v1.2.3


From 5f9860e65c65aa769f11e550e63cc164b1519710 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 21:48:03 -0400
Subject: add type info to influence information

---
 IkiWiki.pm             | 49 ++++++++++++++++++++++++++++++-------------------
 IkiWiki/Plugin/meta.pm |  6 +++---
 doc/plugins/write.mdwn |  6 +++---
 docwiki.setup          |  2 +-
 t/add_depends.t        | 14 +++++++-------
 t/pagespec_match.t     | 32 ++++++++++++++++----------------
 6 files changed, 60 insertions(+), 49 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7adc63139..39a43ddbe 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1795,8 +1795,10 @@ sub add_depends ($$;@) {
 	return if $@;
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page );
-		map { $depends_simple{$page}{lc $_} |= $DEPEND_CONTENT } $r->influences
-			if $r;
+		my %i=$r->influences;
+		foreach my $i (keys %i) {
+			$depends_simple{$page}{lc $i} |= $i{$i};
+		}
 	}
 
 	$depends{$page}{$pagespec} |= $deptype;
@@ -1998,8 +2000,8 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 0 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::SuccessReason'},
-	'&'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
-	'|'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
+	'&'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
+	'|'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
 	fallback => 1,
 );
 
@@ -2011,19 +2013,27 @@ use overload (
 	'""'	=> sub { $_[0][0] },
 	'0+'	=> sub { 1 },
 	'!'	=> sub { bless $_[0], 'IkiWiki::FailReason'},
-	'&'	=> sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
-	'|'	=> sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
+	'&'	=> sub { $_[1]->merge_influences($_[0]); $_[1] },
+	'|'	=> sub { $_[0]->merge_influences($_[1]); $_[0] },
 	fallback => 1,
 );
 
 sub new {
 	my $class = shift;
 	my $value = shift;
-	return bless [$value, {map { $_ => 1 } @_}], $class;
+	return bless [$value, {@_}], $class;
 }
 
 sub influences {
-	return keys %{$_[0][1]};
+	return %{$_[0][1]};
+}
+
+sub merge_influences {
+	my $this=shift;
+	my $other=shift;
+	foreach my $influence (keys %{$other->[1]}) {
+		$this->[1]{$influence} |= $other->[1]{$influence};
+	}
 }
 
 package IkiWiki::ErrorReason;
@@ -2079,23 +2089,24 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", $page) unless $links && @{$links};
+	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS)
+		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS)
 				if $bestlink eq IkiWiki::bestlink($page, $p);
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS)
 				if match_glob($p, $link, %params);
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page)
+			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS)
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", $page);
+	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS);
 }
 
 sub match_backlink ($$;@) {
@@ -2111,14 +2122,14 @@ sub match_created_before ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage);
+			return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage);
+			return IkiWiki::FailReason->new("$page not created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);
 	}
 }
 
@@ -2131,14 +2142,14 @@ sub match_created_after ($$;@) {
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
-			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage);
+			return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 		else {
-			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage);
+			return IkiWiki::FailReason->new("$page not created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);
 		}
 	}
 	else {
-		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);
+		return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);
 	}
 }
 
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a8ee5bc85..c160e7eba 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -291,14 +291,14 @@ sub match {
 
 	if (defined $val) {
 		if ($val=~/^$re$/i) {
-			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page);
+			return IkiWiki::SuccessReason->new("$re matches $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
 		}
 		else {
-			return IkiWiki::FailReason->new("$re does not match $field of $page", $page);
+			return IkiWiki::FailReason->new("$re does not match $field of $page", $page => $IkiWiki::DEPEND_CONTENT);
 		}
 	}
 	else {
-		return IkiWiki::FailReason->new("$page does not have a $field", $page);
+		return IkiWiki::FailReason->new("$page does not have a $field", $page => $IkiWiki::DEPEND_CONTENT);
 	}
 }
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 6b47033e5..232430079 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,9 +982,9 @@ an IkiWiki::FailReason object if the match fails. If the match cannot be
 attempted at all, for any page, it can instead return an
 IkiWiki::ErrorReason object explaining why.
 
-When constructing these objects, you should also include a list of any
-pages whose contents or other metadata influenced the result of the match.
-For example, "backlink(foo)" is influenced by the contents of page foo;
+When constructing these objects, you should also include information about
+of any pages whose contents or other metadata influenced the result of the
+match. For example, "backlink(foo)" is influenced by the contents of page foo;
 "link(foo)" and "title(bar)" are influenced by the contents of any
 page they match; "created_before(foo)" is influenced by the metadata of
 foo; while "glob(*)" is not influenced by the contents of any page.
diff --git a/docwiki.setup b/docwiki.setup
index 52421e501..41c07f024 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -16,5 +16,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{linkmap goodstuff version haiku polygen fortune}],
 }
diff --git a/t/add_depends.t b/t/add_depends.t
index d49aa74ce..9f426187b 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -57,17 +57,17 @@ ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_L
 ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
 # Adding a pagespec that requires page metadata should add the influence
-# as an explicit content dependency.
+# as an explicit dependency. In the case of a link, a links dependency.
 $links{foo0}=$links{foo9}=[qw{bar baz}];
 foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
 	ok(add_depends("foo3", $spec, presence => 1));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo4", $spec, links => 1));
 	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
-	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_LINKS);
 }
 
 # a pagespec with backlinks() will add as an influence the page with the links
@@ -76,20 +76,20 @@ foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
 	ok(add_depends("foo5", $spec, presence => 1));
 	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo6", $spec, links => 1));
 	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
-	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo7", $spec, presence => 1, links => 1));
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
-	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_LINKS);
 	ok(add_depends("foo8", $spec));
 	ok($IkiWiki::depends{foo8}{$spec} & $IkiWiki::DEPEND_CONTENT);
 	ok(! ($IkiWiki::depends{foo8}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_CONTENT);
+	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_LINKS);
 }
 
 # content is the default if unknown types are entered
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 1a0db1cef..36fa04370 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -93,19 +93,19 @@ $ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
 
-$ret=pagespec_match("foo", "link(bar)");
-is(join(",", $ret->influences), 'foo', "link is influenced by the page with the link");
-$ret=pagespec_match("bar", "backlink(foo)");
-is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
-$ret=pagespec_match("bar", "backlink(foo)");
-is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link");
-$ret=pagespec_match("bar", "created_before(foo)");
-is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page");
-$ret=pagespec_match("bar", "created_after(foo)");
-is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page");
-$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences add up over AND");
-$ret=pagespec_match("bar", "link(quux) and created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences add up over OR");
-$ret=pagespec_match("bar", "!link(quux) and !created_after(foo)");
-is(join(",", sort $ret->influences), 'foo,quux', "influences unaffected by negation");
+my %i=pagespec_match("foo", "link(bar)")->influences;
+is(join(",", keys %i), 'foo', "link is influenced by the page with the link");
+%i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
+%i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
+%i=pagespec_match("bar", "created_before(foo)")->influences;
+is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
+%i=pagespec_match("bar", "created_after(foo)")->influences;
+is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
+%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
+%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
+%i=pagespec_match("bar", "!link(quux) and !created_after(foo)")->influences;
+is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 955bcea2a7bacb98cb62a38faa78b05e0f430aac Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 23:48:08 -0400
Subject: fix test broken by change to failing link() influence

---
 t/pagespec_match.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 36fa04370..ab3fcdd4b 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -103,9 +103,9 @@ is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link"
 is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
 %i=pagespec_match("bar", "created_after(foo)")->influences;
 is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
-%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
-%i=pagespec_match("bar", "link(quux) and created_after(foo)")->influences;
+%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
-%i=pagespec_match("bar", "!link(quux) and !created_after(foo)")->influences;
+%i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
 is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 51d889951528a1de4f631435c2deccd1bd326ec5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 19:13:40 -0400
Subject: influences returns hash ref now

---
 t/pagespec_match.t | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index ab3fcdd4b..d529106f7 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -93,19 +93,19 @@ $ret=pagespec_match("foo", "bar or foo");
 ok($ret, "simple match");
 is($ret, "foo matches foo", "stringified return");
 
-my %i=pagespec_match("foo", "link(bar)")->influences;
-is(join(",", keys %i), 'foo', "link is influenced by the page with the link");
-%i=pagespec_match("bar", "backlink(foo)")->influences;
-is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
-%i=pagespec_match("bar", "backlink(foo)")->influences;
-is(join(",", keys %i), 'foo', "backlink is influenced by the page with the link");
-%i=pagespec_match("bar", "created_before(foo)")->influences;
-is(join(",", keys %i), 'foo', "created_before is influenced by the comparison page");
-%i=pagespec_match("bar", "created_after(foo)")->influences;
-is(join(",", keys %i), 'foo', "created_after is influenced by the comparison page");
-%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences add up over AND");
-%i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences add up over OR");
-%i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
-is(join(",", sort keys %i), 'bar,foo', "influences unaffected by negation");
+my $i=pagespec_match("foo", "link(bar)")->influences;
+is(join(",", keys %$i), 'foo', "link is influenced by the page with the link");
+$i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %$i), 'foo', "backlink is influenced by the page with the link");
+$i=pagespec_match("bar", "backlink(foo)")->influences;
+is(join(",", keys %$i), 'foo', "backlink is influenced by the page with the link");
+$i=pagespec_match("bar", "created_before(foo)")->influences;
+is(join(",", keys %$i), 'foo', "created_before is influenced by the comparison page");
+$i=pagespec_match("bar", "created_after(foo)")->influences;
+is(join(",", keys %$i), 'foo', "created_after is influenced by the comparison page");
+$i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences add up over AND");
+$i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
+$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
-- 
cgit v1.2.3


From 01c0f533de4f6504df8e762125ec06f8458b1024 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 30 Nov 2009 18:05:47 -0500
Subject: fix test suite after bestlink change

---
 t/bestlink.t       | 4 ++--
 t/pagespec_match.t | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/t/bestlink.t b/t/bestlink.t
index 033b80d74..0020a05e2 100755
--- a/t/bestlink.t
+++ b/t/bestlink.t
@@ -11,11 +11,11 @@ sub test ($$$) {
 	my @existing_pages=@{shift()};
 	
 	%IkiWiki::pagecase=();
-	%links=();
+	%pagesources=();
 	$IkiWiki::config{userdir}="foouserdir";
 	foreach my $page (@existing_pages) {
 		$IkiWiki::pagecase{lc $page}=$page;
-		$links{$page}=[];
+		$pagesources{$page}="$page.mdwn";
 	}
 
 	return bestlink($page, $link);
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index d529106f7..b96947407 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -49,9 +49,13 @@ $links{"bugs/foo"}=[qw{bugs/done}];
 $links{"bugs/done"}=[];
 $links{"bugs/bar"}=[qw{done}];
 $links{"done"}=[];
+$links{"done"}=[];
 $links{"examples/softwaresite/bugs/fails_to_frobnicate"}=[qw{done}];
 $links{"examples/softwaresite/bugs/done"}=[];
 $links{"ook"}=[qw{/blog/tags/foo}];
+foreach my $p (keys %links) {
+	$pagesources{$p}="$p.mdwn";
+}
 
 ok(pagespec_match("foo", "link(bar)"), "link");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
-- 
cgit v1.2.3


From c923e0ba3377f85107ccea1933a042aaec675c77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 20:39:10 -0500
Subject: Allow globs to be used in user() pagespecs.

---
 IkiWiki.pm                | 4 +++-
 debian/changelog          | 1 +
 doc/ikiwiki/pagespec.mdwn | 3 ++-
 t/pagespec_match.t        | 9 ++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index de7dbfc79..a96ff1236 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2266,11 +2266,13 @@ sub match_user ($$;@) {
 	my $user=shift;
 	my %params=@_;
 	
+	my $regexp=IkiWiki::glob2re($user);
+	
 	if (! exists $params{user}) {
 		return IkiWiki::ErrorReason->new("no user specified");
 	}
 
-	if (defined $params{user} && lc $params{user} eq lc $user) {
+	if (defined $params{user} && $params{user}=~/^$regexp$/i) {
 		return IkiWiki::SuccessReason->new("user is $user");
 	}
 	elsif (! defined $params{user}) {
diff --git a/debian/changelog b/debian/changelog
index 14be7ec69..d74abd0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     a button on the login form to use it.
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
+  * Allow globs to be used in user() pagespecs.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5f0f44e2e..8d8b1a507 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -44,7 +44,8 @@ Some more elaborate limits can be added to what matches using these functions:
   metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
-  be put here.
+  be put here. Glob patterns can be used in the username. For example, 
+  to match all openid users, use `user(*://.*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index b96947407..197ff818b 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 64;
+use Test::More tests => 70;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -40,6 +40,13 @@ ok(! pagespec_match("foo", "foo and bar"), "foo and bar");
 ok(pagespec_match("{f}oo", "{*}*"), "curly match");
 ok(! pagespec_match("foo", "{*}*"), "curly !match");
 
+ok(pagespec_match("somepage", "user(frodo)", user => "frodo"));
+ok(pagespec_match("somepage", "user(frodo)", user => "Frodo"));
+ok(! pagespec_match("somepage", "user(frodo)", user => "Sam"));
+ok(pagespec_match("somepage", "user(*o)", user => "Bilbo"));
+ok(pagespec_match("somepage", "user(*o)", user => "frodo"));
+ok(! pagespec_match("somepage", "user(*o)", user => "Sam"));
+
 # The link and backlink stuff needs this.
 $config{userdir}="";
 $links{foo}=[qw{bar baz}];
-- 
cgit v1.2.3


From 6f3641f16c0043f42212976ccba93b3cf7e4e36f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:42:24 -0500
Subject: add some openid matching tests

---
 t/pagespec_match.t | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 't/pagespec_match.t')

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 197ff818b..8b0be4e8a 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 70;
+use Test::More tests => 72;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -46,6 +46,8 @@ ok(! pagespec_match("somepage", "user(frodo)", user => "Sam"));
 ok(pagespec_match("somepage", "user(*o)", user => "Bilbo"));
 ok(pagespec_match("somepage", "user(*o)", user => "frodo"));
 ok(! pagespec_match("somepage", "user(*o)", user => "Sam"));
+ok(pagespec_match("somepage", "user(http://*.myopenid.com/)", user => "http://foo.myopenid.com/"));
+ok(pagespec_match("somepage", "user(*://*)", user => "http://foo.myopenid.com/"));
 
 # The link and backlink stuff needs this.
 $config{userdir}="";
-- 
cgit v1.2.3


From 0d524ad672333fd0bafa64e81e261fd297c25580 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:38:53 -0400
Subject: Fix incorrect influence info returned by a failing link() pagespec,
 that could lead to bad dependency handling in certian situations.

---
 IkiWiki.pm                         | 4 ++--
 debian/changelog                   | 2 ++
 doc/bugs/depends_simple_mixup.mdwn | 5 +++++
 t/pagespec_match.t                 | 8 +++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 022bfe3bd..927d62940 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2215,7 +2215,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", "" => 1)
+	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
@@ -2232,7 +2232,7 @@ sub match_link ($$;@) {
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);
+	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
 }
 
 sub match_backlink ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index da1ab890e..b9a105552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Add --set-yaml switch for setting more complex config file options.
   * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
+  * Fix incorrect influence info returned by a failing link() pagespec,
+    that could lead to bad dependency handling in certian situations.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index c2845240d..2603ff04c 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -15,4 +15,9 @@ dependency. But, it seems to me it should still be listed in
 
 Then re-add the done link, and the dependency calc code breaks down,
 not noticing that bugs dependeded on the page and needs to be updated.
+
+Ok.. Turns out this was not a problem with the actual influences
+calculation or dependency calculation code. Whew! `match_link`
+just didn't set the influence correctly when failing. [[fixed|done]]
+
 --[[Joey]]
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 8b0be4e8a..ade9bca5a 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 72;
+use Test::More tests => 75;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -54,6 +54,7 @@ $config{userdir}="";
 $links{foo}=[qw{bar baz}];
 $links{bar}=[];
 $links{baz}=[];
+$links{meh}=[];
 $links{"bugs/foo"}=[qw{bugs/done}];
 $links{"bugs/done"}=[];
 $links{"bugs/bar"}=[qw{done}];
@@ -82,6 +83,7 @@ ok(! pagespec_match("bar", ""), "empty pagespec should match nothing");
 ok(! pagespec_match("bar", "    	"), "blank pagespec should match nothing");
 ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success");
 ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
+ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
@@ -122,3 +124,7 @@ $i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
 $i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("meh", "!link(done)")->influences;
+is(join(",", sort keys %$i), 'meh', "a negated, failing link test is successful, so the page is a link influence");
-- 
cgit v1.2.3


From 3ac2ae1f14952bd92038183d92b1eb618c9d0f55 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 18:47:17 -0400
Subject: Add page() PageSpec, which is like glob() but matches only pages, 
 not other files.

---
 IkiWiki.pm                | 10 +++++++++-
 debian/changelog          |  2 ++
 doc/ikiwiki/pagespec.mdwn | 11 ++++++-----
 t/pagespec_match.t        | 16 +++++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

(limited to 't/pagespec_match.t')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 944001d9b..623396c9c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2299,7 +2299,11 @@ sub match_glob ($$;@) {
 
 	my $regexp=IkiWiki::glob2re($glob);
 	if ($page=~/^$regexp$/i) {
-		if (! IkiWiki::isinternal($page) || $params{internal}) {
+		if ($params{onlypage} &&
+		    ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+			return IkiWiki::FailReason->new("$page is not a page");
+		}
+		elsif (! IkiWiki::isinternal($page) || $params{internal}) {
 			return IkiWiki::SuccessReason->new("$glob matches $page");
 		}
 		else {
@@ -2315,6 +2319,10 @@ sub match_internal ($$;@) {
 	return match_glob($_[0], $_[1], @_, internal => 1)
 }
 
+sub match_page ($$;@) {
+	return match_glob($_[0], $_[1], @_, onlypage => 1)
+}
+
 sub match_link ($$;@) {
 	my $page=shift;
 	my $link=lc(shift);
diff --git a/debian/changelog b/debian/changelog
index 1229b1198..610d0c9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low
     the top of the web root. This is another things that requires a wiki
     rebuild on upgrade to this version.
   * Fix removal of rendered files in rebuild mode.
+  * Add page() PageSpec, which is like glob() but matches only pages, 
+    not other files.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 7810e790b..1c99aefac 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -24,19 +24,20 @@ match all pages except for Discussion pages and the SandBox:
 
 Some more elaborate limits can be added to what matches using these functions:
 
+* "`glob(someglob)`" - matches pages and other files that match the given glob.
+  Just writing the glob by itself is actually a shorthand for this function.
+* "`page(glob)`" - like `glob()`, but only matches pages, not other files
 * "`link(page)`" - matches only pages that link to a given page (or glob)
 * "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
   tags matched by a glob)
 * "`backlink(page)`" - matches only pages that a given page links to
-* "`creation_month(month)`" - matches only pages created on the given month
+* "`creation_month(month)`" - matches only files created on the given month
 * "`creation_day(mday)`" - or day of the month
 * "`creation_year(year)`" - or year
-* "`created_after(page)`" - matches only pages created after the given page
+* "`created_after(page)`" - matches only files created after the given page
   was created
-* "`created_before(page)`" - matches only pages created before the given page
+* "`created_before(page)`" - matches only files created before the given page
   was created
-* "`glob(someglob)`" - matches pages that match the given glob. Just writing
-  the glob by itself is actually a shorthand for this function.
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index ade9bca5a..97bcc969c 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 75;
+use Test::More tests => 85;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -66,7 +66,21 @@ $links{"ook"}=[qw{/blog/tags/foo}];
 foreach my $p (keys %links) {
 	$pagesources{$p}="$p.mdwn";
 }
+$pagesources{"foo.png"}="foo.png";
+$pagesources{"foo"}="foo.mdwn";
+$IkiWiki::hooks{htmlize}{mdwn}={};
 
+ok(pagespec_match("foo", "foo"), "simple");
+ok(! pagespec_match("foo", "bar"), "simple fail");
+ok(pagespec_match("foo", "foo"), "simple glob");
+ok(pagespec_match("foo", "f*"), "simple glob fail");
+ok(pagespec_match("foo", "page(foo)"), "page()");
+print pagespec_match("foo", "page(foo)")."\n";
+ok(! pagespec_match("foo", "page(bar)"), "page() fail");
+ok(! pagespec_match("foo.png", "page(foo.png)"), "page() fails on non-page");
+ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob");
+ok(pagespec_match("foo", "page(foo)"), "page() glob");
+ok(pagespec_match("foo", "page(f*)"), "page() glob fail");
 ok(pagespec_match("foo", "link(bar)"), "link");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
 ok(! pagespec_match("foo", "link(quux)"), "failed link");
-- 
cgit v1.2.3