urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove now-unused function pagespec_merge 

Now that dependencies are a list of pagespecs with an implicit "or"
operation, there's no need to try to merge pagespecs under normal use.

ikiwiki-transition contains the only use of the function, so move
it there rather than deleting it entirely (it's used to concatenate all
admins' lists of locked pages).
master
Simon McVittie 2009-07-25 20:04:04 +01:00
parent bc6e50a075
commit 1ea8580a5f
3 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki.pm
View File

@ -1833,14 +1833,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;

10
ikiwiki-transition
View File

@ -335,4 +335,14 @@ sub get_banned_users () {
return @ret;
}
# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
# setup file) now.
sub pagespec_merge ($$) {
my $a=shift;
my $b=shift;
return $a if $a eq $b;
return "($a) or ($b)";
}
1

44
t/pagespec_merge.t
View File

@ -1,44 +0,0 @@
#!/usr/bin/perl
use warnings;
use strict;
use Test::More tests => 25;
BEGIN { use_ok("IkiWiki"); }
sub same {
my $a=shift;
my $b=shift;
my $match=shift;
my $imatch=(pagespec_match($match, $a) ||
pagespec_match($match, $b));
my $cmatch=pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
return $imatch == $cmatch;
}
ok(same("foo", "bar", "foo"), "basic match 1");
ok(same("foo", "bar", "bar"), "basic match 2");
ok(same("foo", "bar", "foobar"), "basic failed match");
ok(same("foo", "!bar", "foo"), "basic match with inversion");
ok(same("foo", "!bar", "bar"), "basic failed match with inversion");
ok(same("!foo", "bar", "foo"), "basic failed match with inversion 2");
ok(same("!foo", "bar", "bar"), "basic match with inversion 2");
ok(same("!foo", "!bar", "foo"), "double inversion failed match");
ok(same("!foo", "!bar", "bar"), "double inversion failed match 2");
ok(same("*", "!bar", "foo"), "glob+inversion match");
ok(same("*", "!bar", "bar"), "matching glob and matching inversion");
ok(same("* and !foo", "!bar", "bar"), "matching glob and matching inversion");
ok(same("* and !foo", "!bar", "foo"), "matching glob with matching inversion and non-matching inversion");
ok(same("* and !foo", "!foo", "foo"), "matching glob with matching inversion and matching inversion");
ok(same("b??", "!b??", "bar"), "matching glob and matching inverted glob");
ok(same("f?? !f??", "!bar", "bar"), "matching glob and matching inverted glob");
ok(same("b??", "!b?z", "bar"), "matching glob and non-matching inverted glob");
ok(same("f?? !f?z", "!bar", "bar"), "matching glob and non-matching inverted glob");
ok(same("!foo bar baz", "!bar", "bar"), "matching list and matching inversion");
ok(pagespec_match("foo/Discussion",
IkiWiki::pagespec_merge("* and !*/Discussion", "*/Discussion")), "should match");
ok(same("* and !*/Discussion", "*/Discussion", "foo/Discussion"), "Discussion merge 1");
ok(same("*/Discussion", "* and !*/Discussion", "foo/Discussion"), "Discussion merge 2");
ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/Discussion"), "bidirectional merge 1");
ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/bar"), "bidirectional merge 2");