* Add user(name) to the PageSpec for commit subscriptions.

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index d32f5c1bf9436fb30cfb93992723a554f3be8692..8bd056248ff1ee02884fc7f6847b9e9dc83ad8f1 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -92,8 +92,11 @@ sub set_banned_users (@) { #{{{
        return userinfo_store($userinfo);
 } #}}}
 
        return userinfo_store($userinfo);
 } #}}}
 

+# Global used to pass information into the PageSpec function.
+our $committer;
+

 sub commit_notify_list ($@) { #{{{
 sub commit_notify_list ($@) { #{{{

-       my $committer=shift;
+       $committer=shift;

        my @pages = map pagename($_), @_;
 
        my @ret;
        my @pages = map pagename($_), @_;
 
        my @ret;


@@ -177,4 +180,13 @@ sub send_commit_mails ($$$@) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+package IkiWiki::PageSpec;
+
+sub match_user ($$$) { #{{{
+       shift;
+       my $user=shift;
+
+       return $user eq $committer;
+} #}}}
+

 1
 1

diff --git a/debian/changelog b/debian/changelog
index b9dc7fae431082851f0a4a21fa31552d2af96ab3..2ebb385b8b9ab96b16f3e3a2487b4bff6a2bda82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,9 @@ ikiwiki (1.51) UNRELEASED; urgency=low
     wiki rebuilds are recommended on upgrade to this version.
   * Avoid .svn directories when installing from svn checkout.
   * Fix sending of commit mails when new pages are added via the web.
     wiki rebuilds are recommended on upgrade to this version.
   * Avoid .svn directories when installing from svn checkout.
   * Fix sending of commit mails when new pages are added via the web.

+  * Add user(name) to the PageSpec for commit subscriptions.

 
 

- -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 19:27:42 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 20:25:53 -0400

 
 ikiwiki (1.50) unstable; urgency=low
 
 
 ikiwiki (1.50) unstable; urgency=low
 

diff --git a/doc/pagespec.mdwn b/doc/pagespec.mdwn
index 53519e7f02d798976311c847beca3c8e188e1891..b26a42e2803db992f4e9e042c8a925904bffafee 100644 (file)
--- a/doc/pagespec.mdwn
+++ b/doc/pagespec.mdwn
@@ -33,6 +33,8 @@ functions:
   was created
 * "`created_before(page)`" - match only pages created before the given page
   was created
   was created
 * "`created_before(page)`" - match only pages created before the given page
   was created

+* "`user(name)`" - only available in page subscription preferences, match
+  only changes made by this user

 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:

diff --git a/doc/todo/excluding_commit_mails.mdwn b/doc/todo/excluding_commit_mails.mdwn
index 0a7c7425cf9b3ceb3016bf9094a17ad4ce5707e0..9ae838fe0cf2dbee7a3207998aa789a3295bf988 100644 (file)
--- a/doc/todo/excluding_commit_mails.mdwn
+++ b/doc/todo/excluding_commit_mails.mdwn
@@ -15,3 +15,5 @@ subscribe to:
        * and !SandBox and !user(joey)
 
 Insert standard argument about how wonderfly flexible this is. :-)
        * and !SandBox and !user(joey)
 
 Insert standard argument about how wonderfly flexible this is. :-)

+
+[[done]]

diff --git a/po/bg.po b/po/bg.po
index 12462376aecdead30c583d4641ade2d6d2cd258b..6e164b90fd0b52aae1b61b13d0c3320e11ff473f 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"


@@ -104,7 +104,7 @@ msgstr "шаблонът „%s” не е намерен"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/cs.po b/po/cs.po
index 970d24ab16107fa94babfdd26ee000b3ad51a8e6..814361ae58ecf9a1a7faed86ac77d4e5e69d8278 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-02-17 12:07+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "PO-Revision-Date: 2007-02-17 12:07+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"


@@ -103,7 +103,7 @@ msgstr "šablona %s nebyla nalezena"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/es.po b/po/es.po
index 8e48f82d1425d622fa73b0bcd97fb8ee9f868e43..fd9b95491f7941742197e8540c238aaadc4b5087 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"


@@ -106,7 +106,7 @@ msgstr "no he encontrado la plantilla %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/fr.po b/po/fr.po
index f49cbc963b250b470fcb579bb00aa4f83bd7dbfe..e053fb677d98dd50e8400588469030a6de20e106 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-04-01 21:03+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2007-04-01 21:03+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -106,7 +106,7 @@ msgstr "%s introuvable "
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/gu.po b/po/gu.po
index 410a0237538ba6c88aa46ebbbc1c7d80edb605eb..82c13924084102cb2a498afc846c87100c24b403 100644 (file)
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"


@@ -103,7 +103,7 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 2c95f864941f12a5bb6419038fabd9d0442461a5..28d837cf313697a6daa0c7b3a52f7a3b1a5dff28 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -103,7 +103,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/pl.po b/po/pl.po
index 09089ba0abf7e6b5e1cd0ef4de9ea086aa9fef42..6a5a874e1eb72cbacd836d7aa536ec345d218ef3 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.37\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki 1.37\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-01-05 16:33+100\n"
 "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
 "PO-Revision-Date: 2007-01-05 16:33+100\n"
 "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"


@@ -104,7 +104,7 @@ msgstr "nieznaleziony szablon %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/sv.po b/po/sv.po
index ccfd1eb3fa43e4e5bcd57ac4f8fed142524994d5..396faf259f8e667680bf8909ad7782f9b3106a93 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"


@@ -103,7 +103,7 @@ msgstr "mallen %s hittades inte"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283

diff --git a/po/vi.po b/po/vi.po
index 38a0de0341231825c9fb2e20393e1dfc55edd448..1cbd86f43d45eb798181dacd63dddca55752f577 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-23 14:43-0400\n"
+"POT-Creation-Date: 2007-04-26 20:28-0400\n"

 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"


@@ -104,7 +104,7 @@ msgstr "không tìm thấy mẫu %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:278
 #, perl-format

-msgid "invalid UTF-8 stripped from feed"
+msgid "(invalid UTF-8 stripped from feed)"

 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:283