Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / pagespec_expansions.mdwn

diff --git a/doc/todo/pagespec_expansions.mdwn b/doc/todo/pagespec_expansions.mdwn
index 0ac2d8e3cdf39e81b9aa627ad17a73b3cc6d02a5..6107f5489673d847f20d86512eb9e3579b4c4e4a 100644 (file)
--- a/doc/todo/pagespec_expansions.mdwn
+++ b/doc/todo/pagespec_expansions.mdwn
@@ -50,6 +50,10 @@ I can see why it might not be much of an improvement. :) --Ethan
 
 >>>> I know it's not necessary, but it would be helpful. --Ethan
 
 
 >>>> I know it's not necessary, but it would be helpful. --Ethan
 

+>>>>> I don't see the need for a new syntax since it's only a little long
+>>>>> using the old one. And of course even that can now be shortened: 
+>>>>> "./* and !./*/*" --[[Joey]]
+

 OK, I took a shot at implementing the changes. I was thinking about making
 pagespecs relative by default but I couldn't decide whether page
 `foo/bar` inlining `*` should match `foo/bar/*` or `foo/*`.
 OK, I took a shot at implementing the changes. I was thinking about making
 pagespecs relative by default but I couldn't decide whether page
 `foo/bar` inlining `*` should match `foo/bar/*` or `foo/*`.


@@ -123,8 +127,25 @@ and you can see it work at
 >>>> satisfied. --Ethan
 
 > I've committed support for ./ to ikiwiki now, based on your patch.
 >>>> satisfied. --Ethan
 
 > I've committed support for ./ to ikiwiki now, based on your patch.

+> [[todo/done]]

 > --[[Joey]]
 
 >> Cool! I haven't played with it yet, but looking over the patch, I see that
 >> you added another parameter to match_glob, which is an approach that didn't
 >> occur to me. I like it, it's more flexible. --Ethan
 > --[[Joey]]
 
 >> Cool! I haven't played with it yet, but looking over the patch, I see that
 >> you added another parameter to match_glob, which is an approach that didn't
 >> occur to me. I like it, it's more flexible. --Ethan

+
+One last thing -- could you either change:
+
+                $from=~s!/?[^/]+$!!;
+
+to 
+
+                $from=~s!/?[^/]*$!!;
+
+Or could you put in:
+
+                $glob =~ s!//!/!g;
+
+somewhere? Or should I just add this to my index patch? --Ethan
+
+> If it's specific to your index patch, let's put it in there. --[[Joey]]