Changeset 55

Timestamp:

2008年08月30日 17时42分05秒 (4 years ago)

Author:

jiangx

Message:

Fix #10:

• upgrade to 0.3.0; add requires;
• update template for pylons 0.9.7
• webhelpers upgrade from 0.3 to 0.6
• Babel upgrade to 0.9.4
• new routing format
• function tests passed for new routes
• link_to from webhelpers.html is different with link_to from webhelpers.rails
• scriptaculous and prototype no longer maintain by pylons
• do not check against authz file using svn swig bidings if ImportError?
• bugfix: wrong tuple for role_list_opts
• import literal

Push info:

    ------------------------------------------------------------------------
    r118 | jiangxin | 2008-08-30 16:57:18 +0800 (Sat, 30 Aug 2008) | 1 line

    if svn swig binding not exist, ignore testcase
    ------------------------------------------------------------------------
    r117 | jiangxin | 2008-08-30 16:33:53 +0800 (Sat, 30 Aug 2008) | 1 line

    function tests passed for new routes
    ------------------------------------------------------------------------
    r113 | jiangxin | 2008-08-30 15:47:39 +0800 (Sat, 30 Aug 2008) | 1 line

    upgrade to 0.3.0; add requires;
    ------------------------------------------------------------------------
    r112 | jiangxin | 2008-08-30 14:38:00 +0800 (Sat, 30 Aug 2008) | 1 line

    link_to from webhelpers.html is different with link_to from webhelpers.rails
    ------------------------------------------------------------------------
    r108 | jiangxin | 2008-08-30 14:02:36 +0800 (Sat, 30 Aug 2008) | 1 line

    do not check against authz file using svn swig bidings if ImportError
    ------------------------------------------------------------------------
    r106 | jiangxin | 2008-08-30 13:15:05 +0800 (Sat, 30 Aug 2008) | 1 line

    Babel upgrade to 0.9.4
    ------------------------------------------------------------------------
    r104 | jiangxin | 2008-08-30 00:00:31 +0800 (Sat, 30 Aug 2008) | 1 line

    scriptaculous and prototype no longer maintain by pylons
    ------------------------------------------------------------------------
    r103 | jiangxin | 2008-08-29 23:59:50 +0800 (Fri, 29 Aug 2008) | 1 line

    bugfix: wrong tuple for role_list_opts
    ------------------------------------------------------------------------
    r102 | jiangxin | 2008-08-29 23:37:49 +0800 (Fri, 29 Aug 2008) | 1 line

    new routing format
    ------------------------------------------------------------------------
    r101 | jiangxin | 2008-08-29 23:00:42 +0800 (Fri, 29 Aug 2008) | 1 line

    import literal
    ------------------------------------------------------------------------
    r100 | jiangxin | 2008-08-29 22:53:08 +0800 (Fri, 29 Aug 2008) | 1 line

    update template for pylons 0.9.7
    ------------------------------------------------------------------------
    r99 | jiangxin | 2008-08-29 21:50:12 +0800 (Fri, 29 Aug 2008) | 1 line

    webhelpers upgrade from 0.3 to 0.6
    ------------------------------------------------------------------------

Location:

trunk

Files:

• MANIFEST.in (modified) (1 diff)
• development.ini (modified) (2 diffs)
• docs/index.txt (modified) (1 diff)
• ez_setup.py (added)
• pySvnManager.egg-info/SOURCES.txt (modified) (2 diffs)
• pySvnManager.egg-info/paster_plugins.txt (modified) (1 diff)
• pySvnManager.egg-info/requires.txt (modified) (1 diff)
• pysvnmanager/config/environment.py (modified) (2 diffs)
• pysvnmanager/config/middleware.py (modified) (3 diffs)
• pysvnmanager/config/routing.py (modified) (1 diff)
• pysvnmanager/controllers/error.py (modified) (2 diffs)
• pysvnmanager/controllers/logs.py (modified) (1 diff)
• pysvnmanager/i18n/en/LC_MESSAGES/pysvnmanager.po (modified) (25 diffs)
• pysvnmanager/i18n/pysvnmanager.pot (modified) (22 diffs)
• pysvnmanager/i18n/zh/LC_MESSAGES/pysvnmanager.po (modified) (24 diffs)
• pysvnmanager/lib/app_globals.py (modified) (1 diff)
• pysvnmanager/lib/base.py (modified) (2 diffs)
• pysvnmanager/lib/helpers.py (modified) (1 diff)
• pysvnmanager/model/svnauthz.py (modified) (1 diff)
• pysvnmanager/public/javascripts (added)
• pysvnmanager/public/javascripts/builder.js (added)
• pysvnmanager/public/javascripts/controls.js (added)
• pysvnmanager/public/javascripts/dragdrop.js (added)
• pysvnmanager/public/javascripts/effects.js (added)
• pysvnmanager/public/javascripts/prototype.js (added)
• pysvnmanager/public/javascripts/scriptaculous.js (added)
• pysvnmanager/public/javascripts/slider.js (added)
• pysvnmanager/public/javascripts/sound.js (added)
• pysvnmanager/public/javascripts/unittest.js (added)
• pysvnmanager/templates/base.mako (modified) (1 diff)
• pysvnmanager/templates/check/index.mako (modified) (5 diffs)
• pysvnmanager/templates/repos/create.mako (modified) (1 diff)
• pysvnmanager/templates/repos/hooks.mako (modified) (3 diffs)
• pysvnmanager/templates/repos/remove.mako (modified) (1 diff)
• pysvnmanager/templates/role/index.mako (modified) (4 diffs)
• pysvnmanager/tests/__init__.py (modified) (3 diffs)
• pysvnmanager/tests/functional/test_authz.py (modified) (12 diffs)
• pysvnmanager/tests/functional/test_check.py (modified) (6 diffs)
• pysvnmanager/tests/functional/test_login.py (modified) (2 diffs)
• pysvnmanager/tests/functional/test_repos.py (modified) (3 diffs)
• pysvnmanager/tests/functional/test_role.py (modified) (13 diffs)
• pysvnmanager/tests/test_repos.py (modified) (1 diff)
• pysvnmanager/websetup.py (modified) (1 diff)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (3 diffs)

trunk/MANIFEST.in

@@ -1 +1 @@
 recursive-include pysvnmanager/public *
 recursive-include pysvnmanager/templates *
-recursive-include pysvnmanager/config *
+recursive-include pysvnmanager/config *.py *.in
 recursive-include pysvnmanager/i18n *
+recursive-include pysvnmanager/hooks *.py
+recursive-include pysvnmanager/hooks/init/hook* *

trunk/development.ini

@@ -64 +64 @@
 # Logging configuration
 [loggers]
-keys = root, pysvnmanager
+keys = root, routes, pysvnmanager
 
 [handlers]
@@ -75 +75 @@
 level = INFO
 handlers = console
+
+[logger_routes]
+level = INFO
+handlers =
+qualname = routes.middleware
+# "level = DEBUG" logs the route matched and routing variables.
 
 [logger_pysvnmanager]

trunk/docs/index.txt

@@ -9 +9 @@
     setup.py pudge
 
-For this to work you will need to download and install ``buildutils`` and
-``pudge``.
+For this to work you will need to download and install `buildutils`_,
+`pudge`_, and `pygments`_.  The ``pudge`` command is disabled by
+default; to ativate it in your project, run::
+
+    setup.py addcommand -p buildutils.pudge_command
+
+.. _buildutils: http://pypi.python.org/pypi/buildutils
+.. _pudge: http://pudge.lesscode.org/
+.. _pygments: http://pygments.org/

trunk/pySvnManager.egg-info/SOURCES.txt

@@ -2 +2 @@
 README.txt
 development.ini
+ez_setup.py
 init.d
 setup.cfg
@@ -136 +137 @@
 pysvnmanager/public/img/icon-error.png
 pysvnmanager/public/img/icon-info.png
+pysvnmanager/public/javascripts/builder.js
+pysvnmanager/public/javascripts/controls.js
+pysvnmanager/public/javascripts/dragdrop.js
+pysvnmanager/public/javascripts/effects.js
+pysvnmanager/public/javascripts/prototype.js
+pysvnmanager/public/javascripts/scriptaculous.js
+pysvnmanager/public/javascripts/slider.js
+pysvnmanager/public/javascripts/sound.js
+pysvnmanager/public/javascripts/unittest.js
 pysvnmanager/templates/auth_failed.mako
 pysvnmanager/templates/base.mako

trunk/pySvnManager.egg-info/paster_plugins.txt

@@ +1 @@
+PasteScript
 Pylons
-WebHelpers
-PasteScript

trunk/pySvnManager.egg-info/requires.txt

@@ -1 @@
-Pylons>=0.9.6.2
+Pylons>=0.9.7rc1
 docutils
+Babel

trunk/pysvnmanager/config/environment.py

@@ -3 +3 @@
 import os
 
+from mako.lookup import TemplateLookup
 from pylons import config
 
@@ -21 +22 @@
 
     # Initialize config with the basic options
-    config.init_app(global_conf, app_conf, package='pysvnmanager',
-                    template_engine='mako', paths=paths)
+    config.init_app(global_conf, app_conf, package='pysvnmanager', paths=paths)
 
     config['routes.map'] = make_map()
-    config['pylons.g'] = app_globals.Globals()
+    config['pylons.app_globals'] = app_globals.Globals()
     config['pylons.h'] = pysvnmanager.lib.helpers
 
-    # Customize templating options via this variable
-    tmpl_options = config['buffet.template_options']
-    
-    # 设置缺省编码为 utf8
-    tmpl_options['mako.input_encoding'] = 'UTF-8'
-    tmpl_options['mako.output_encoding'] = 'UTF-8'
-    #tmpl_options['mako.default_filters'] = ['decode.utf8']
-
-
+    # Create the Mako TemplateLookup, with the default auto-escaping
+    config['pylons.app_globals'].mako_lookup = TemplateLookup(
+        directories=paths['templates'],
+        module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
+        input_encoding='utf-8', output_encoding='utf-8',
+        imports=['from webhelpers.html import escape'],
+        )
+        #default_filters=['escape'])
+        
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)

trunk/pysvnmanager/config/middleware.py

@@ -1 +1 @@
 """Pylons middleware initialization"""
+from beaker.middleware import CacheMiddleware, SessionMiddleware
 from paste.cascade import Cascade
 from paste.registry import RegistryManager
 from paste.urlparser import StaticURLParser
 from paste.deploy.converters import asbool
-
 from pylons import config
-from pylons.error import error_template
-from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler, \
-    StaticJavascripts
+from pylons.middleware import ErrorHandler, StatusCodeRedirect
 from pylons.wsgiapp import PylonsApp
+from routes.middleware import RoutesMiddleware
 
 from pysvnmanager.config.environment import load_environment
@@ -27 +26 @@
 
     ``app_conf``
-        The application's local configuration. Normally specified in the
-        [app:<name>] section of the Paste ini file (where <name>
+        The application's local configuration. Normally specified in
+        the [app:<name>] section of the Paste ini file (where <name>
         defaults to main).
+
     """
     # Configure the Pylons environment
@@ -36 +36 @@
     # The Pylons WSGI app
     app = PylonsApp()
-
+    
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
-
+    
+    # Routing/Session/Cache Middleware
+    app = RoutesMiddleware(app, config['routes.map'])
+    app = SessionMiddleware(app, config)
+    app = CacheMiddleware(app, config)
+    
     if asbool(full_stack):
         # Handle Python exceptions
-        app = ErrorHandler(app, global_conf, error_template=error_template,
-                           **config['pylons.errorware'])
+        app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
 
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
-        app = ErrorDocuments(app, global_conf, mapper=error_mapper, **app_conf)
+        if asbool(config['debug']):
+            app = StatusCodeRedirect(app)
+        else:
+            app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
 
     # Establish the Registry for this application
     app = RegistryManager(app)
 
-    # Static files
-    javascripts_app = StaticJavascripts()
+    # Static files (If running in production, and Apache or another web 
+    # server is handling this static content, remove the following 3 lines)
     static_app = StaticURLParser(config['pylons.paths']['static_files'])
-    app = Cascade([static_app, javascripts_app, app])
+    app = Cascade([static_app, app])
     return app

trunk/pysvnmanager/config/routing.py

@@ -12 +12 @@
     map = Mapper(directory=config['pylons.paths']['controllers'],
                  always_scan=config['debug'])
-
+    map.minimization = False
+    
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
-    map.connect('error/:action/:id', controller='error')
+    map.connect('/error/{action}', controller='error')
+    map.connect('/error/{action}/{id}', controller='error')
 
     # CUSTOM ROUTES HERE
-    map.connect('', controller='check', action='index')
-    map.connect('login', controller='security', action='index')
-    map.connect('logout', controller='security', action='logout')
+    map.connect('/', controller='check', action='index')
+    map.connect('/login', controller='security', action='index')
+    map.connect('/logout', controller='security', action='logout')
 
-    map.connect(':controller/:action/:id')
-    map.connect('*url', controller='template', action='view')
+    map.connect('/{controller}')
+    map.connect('/{controller}/{action}')
+    map.connect('/{controller}/{action}/{id}')
 
     return map

trunk/pysvnmanager/controllers/error.py

@@ -21 +21 @@
 
 from paste.urlparser import StaticURLParser
+from pylons import request
+from pylons.controllers.util import forward
 from pylons.middleware import error_document_template, media_path
+from webhelpers.html.builder import literal
 
-from pysvnmanager.lib.base import *
+from pysvnmanager.lib.base import BaseController
 
 class ErrorController(BaseController):
@@ -37 +40 @@
     def document(self):
         """Render the error document"""
+        resp = request.environ.get('pylons.original_response')
+        content = literal(resp.body) or cgi.escape(request.GET.get('message'))
         page = error_document_template % \
             dict(prefix=request.environ.get('SCRIPT_NAME', ''),
-                 code=cgi.escape(request.params.get('code', '')),
-                 message=cgi.escape(request.params.get('message', '')))
+                 code=cgi.escape(request.GET.get('code', str(resp.status_int))),
+                 message=content)
         return page
 

trunk/pysvnmanager/controllers/logs.py

@@ -88 +88 @@
             'when': logs[i].get('date',''), 
             'why' : h.link_to(logs[i].get('log',''), \
-                              h.url(action='view', id=logs[i].get('revision','')), \
-                              popup=['view_logs']
+                              h.url_for(action='view', id=logs[i].get('revision','')), \
+                              onclick="window.open(this.href,'view_logs','location=0,toolbar=0,width=780,height=580');return false;"
                               ), 
             }

trunk/pysvnmanager/i18n/en/LC_MESSAGES/pysvnmanager.po

@@ -10 +10 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-08-28 19:02+0800\n"
+"PO-Revision-Date: 2008-08-30 13:12+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -17 +17 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.2\n"
-
-#: pysvnmanager/controllers/authz.py:43
+"Generated-By: Babel 0.9.4\n"
+
+#: pysvnmanager/controllers/authz.py:60
 #: pysvnmanager/templates/authz/index.mako:152
 #: pysvnmanager/templates/check/index.mako:10
@@ -25 +25 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:44
+#: pysvnmanager/controllers/authz.py:61
 #: pysvnmanager/templates/authz/index.mako:154
 #: pysvnmanager/templates/check/index.mako:11
@@ -31 +31 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:45
+#: pysvnmanager/controllers/authz.py:62
 #: pysvnmanager/templates/authz/index.mako:156
 #: pysvnmanager/templates/check/index.mako:12
@@ -37 +37 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:50 pysvnmanager/controllers/role.py:50
-#: pysvnmanager/controllers/role.py:70
+#: pysvnmanager/controllers/authz.py:67 pysvnmanager/controllers/role.py:67
+#: pysvnmanager/controllers/role.py:87
 #: pysvnmanager/templates/authz/index.mako:148
 #: pysvnmanager/templates/check/index.mako:17
@@ -48 +48 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:53 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:72
+#: pysvnmanager/controllers/authz.py:70 pysvnmanager/controllers/role.py:72
+#: pysvnmanager/controllers/role.py:89
 #: pysvnmanager/templates/authz/index.mako:150
 #: pysvnmanager/templates/check/index.mako:19
@@ -59 +59 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:68 pysvnmanager/controllers/authz.py:99
-#: pysvnmanager/controllers/check.py:89 pysvnmanager/controllers/repos.py:40
-#: pysvnmanager/controllers/repos.py:59 pysvnmanager/controllers/role.py:43
+#: pysvnmanager/controllers/authz.py:85 pysvnmanager/controllers/authz.py:116
+#: pysvnmanager/controllers/check.py:106 pysvnmanager/controllers/repos.py:57
+#: pysvnmanager/controllers/repos.py:76 pysvnmanager/controllers/role.py:60
 #: pysvnmanager/templates/check/index.mako:9
 #: pysvnmanager/templates/check/index.mako:23
@@ -69 +69 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:177
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:173
+#: pysvnmanager/controllers/authz.py:190
 #, python-format
 msgid "Repository %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:181
+#: pysvnmanager/controllers/authz.py:198
 #, python-format
 msgid "Module %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:187
+#: pysvnmanager/controllers/authz.py:204
 msgid "You can not delete yourself from admin list."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:212
+#: pysvnmanager/controllers/authz.py:229
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/check.py:69
+#: pysvnmanager/controllers/check.py:86
 #: pysvnmanager/templates/auth_failed.mako:3
 msgid "Permission denied."
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:50
+#: pysvnmanager/controllers/logs.py:68
 msgid "Rev"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:51
+#: pysvnmanager/controllers/logs.py:69
 msgid "Who"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:52
+#: pysvnmanager/controllers/logs.py:70
 msgid "When"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:53
+#: pysvnmanager/controllers/logs.py:71
 msgid "Why"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:54
+#: pysvnmanager/controllers/logs.py:72
 msgid "Compare"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:97
+#: pysvnmanager/controllers/logs.py:115
 msgid "Page: "
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:133
+#: pysvnmanager/controllers/logs.py:151
 msgid "Compares between"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:152
+#: pysvnmanager/controllers/logs.py:170
 #, python-format
 msgid "Rollback successfully to revision: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:161
+#: pysvnmanager/controllers/logs.py:179
 #, python-format
 msgid "Rollback failed: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:74
+#: pysvnmanager/controllers/repos.py:91
 msgid "Installed hooks:"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:80
+#: pysvnmanager/controllers/repos.py:97
 msgid "Id"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:81
+#: pysvnmanager/controllers/repos.py:98
 msgid "Plugin name"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:82
-#: pysvnmanager/hooks/plugins/__init__.py:314
+#: pysvnmanager/controllers/repos.py:99
+#: pysvnmanager/hooks/plugins/__init__.py:330
 msgid "Type"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:96
+#: pysvnmanager/controllers/repos.py:113
 msgid "Remove selected hooks"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:119
+#: pysvnmanager/controllers/repos.py:136
 #, python-format
 msgid ""
@@ -164 +164 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:122
+#: pysvnmanager/controllers/repos.py:139
 #, python-format
 msgid "Apply plugin '%(plugin)s' on '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:143
+#: pysvnmanager/controllers/repos.py:160
 #, python-format
 msgid ""
@@ -176 +176 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:146
+#: pysvnmanager/controllers/repos.py:163
 #, python-format
 msgid "Delete plugin '%(plugin)s' on '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:149
+#: pysvnmanager/controllers/repos.py:166
 #, python-format
 msgid "No plugin has been deleted for '%(repos)s'."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:158
+#: pysvnmanager/controllers/repos.py:175
 #, python-format
 msgid ""
@@ -193 +193 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:161
+#: pysvnmanager/controllers/repos.py:178
 #, python-format
 msgid "Create repository '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:174
+#: pysvnmanager/controllers/repos.py:191
 #, python-format
 msgid ""
@@ -205 +205 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:177
+#: pysvnmanager/controllers/repos.py:194
 #, python-format
 msgid "Delete blank repository '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:103
+#: pysvnmanager/controllers/role.py:120
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:123
+#: pysvnmanager/controllers/role.py:140
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:145
+#: pysvnmanager/controllers/role.py:162
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:165
+#: pysvnmanager/controllers/role.py:182
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:34
+#: pysvnmanager/controllers/security.py:52
 #, python-format
 msgid "User %s logged in"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:45
+#: pysvnmanager/controllers/security.py:63
 #, python-format
 msgid "Login failed for user: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:53
+#: pysvnmanager/controllers/security.py:71
 #, python-format
 msgid "User %s logged out"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:10
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:26
 msgid "Allow revprop change"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:16
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:32
 msgid "Allow user change commit-log or other rev-properties."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:19
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:35
 msgid ""
 "Commit-log is the only rev-prop we allow to change. Because the changes "
@@ -260 +260 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:10
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:26
 msgid "Mantis bugtracking integration"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:16
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:32
 msgid ""
 "Integration Subversion with Mantis bugtracking. If commit-log has proper "
@@ -271 +271 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:10
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:26
 msgid "Subversion client version check (>1.5.0)"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:16
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:32
 msgid "Check subversion client version. if version below 1.5.0, checkin denied."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:19
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:35
 msgid ""
 "SVN below 1.5.0 can not handle mergeinfo properly.It can mess up our "
@@ -285 +285 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:10
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:26
 msgid "Detect case-insensitive filename clashes"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:16
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:32
 msgid "A pre-commit hook to detect case-insensitive filename clashes."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:19
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:35
 msgid ""
 "Subversion services may host on a filename case-sensitive OS,\n"
@@ -305 +305 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:11
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:27
 msgid "Check commit log message"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:17
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:33
 msgid "User must provide commit-log message when checkin."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:50
-#: pysvnmanager/hooks/plugins/EmailNotify.py:73
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:49
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:66
+#: pysvnmanager/hooks/plugins/EmailNotify.py:89
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
 msgid "Current configuration"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:52
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:68
 msgid "Commit log check is enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:54
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:70
 msgid "Commit log check is disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:56
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:95
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:72
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:111
 msgid "Minimal size of commit log: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:61
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:101
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:77
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:117
 msgid "Pattern which commit log must match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:64
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:80
 msgid "Pattern which commit log must **NOT** match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:83
-#: pysvnmanager/hooks/plugins/EmailNotify.py:97
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:73
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:99
+#: pysvnmanager/hooks/plugins/EmailNotify.py:113
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:89
 msgid "Fill this form"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:87
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:103
 msgid "Enable commit log check: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:90
-#: pysvnmanager/hooks/plugins/EmailNotify.py:104
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:80
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:106
+#: pysvnmanager/hooks/plugins/EmailNotify.py:120
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:96
 msgid "Enable"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:92
-#: pysvnmanager/hooks/plugins/EmailNotify.py:106
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:82
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:108
+#: pysvnmanager/hooks/plugins/EmailNotify.py:122
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
 msgid "Disable"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:107
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:123
 msgid "Pattern which commit log must <b>NOT</b> match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:140
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:156
 msgid "Commit log size must > 0."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:11
+#: pysvnmanager/hooks/plugins/EmailNotify.py:27
 msgid "Send email notify for commit event"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:17
+#: pysvnmanager/hooks/plugins/EmailNotify.py:33
 msgid ""
 "Send a notification email describing either a commit or a revprop-change "
@@ -381 +381 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:21
+#: pysvnmanager/hooks/plugins/EmailNotify.py:37
 msgid ""
 "\n"
@@ -407 +407 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:75
+#: pysvnmanager/hooks/plugins/EmailNotify.py:91
 msgid "Email notify enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:77
+#: pysvnmanager/hooks/plugins/EmailNotify.py:93
 msgid "Email notify disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:79
+#: pysvnmanager/hooks/plugins/EmailNotify.py:95
 msgid "Parameters: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:101
+#: pysvnmanager/hooks/plugins/EmailNotify.py:117
 msgid "Enable email notify."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:109
+#: pysvnmanager/hooks/plugins/EmailNotify.py:125
 msgid "Input email notify configurations: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:139
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:115
+#: pysvnmanager/hooks/plugins/EmailNotify.py:155
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:131
 msgid "Wrong configuration."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:10
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:26
 msgid "mime-type and eol-style check"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:16
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:32
 msgid "New file must provide svn:eol-style if not binary file."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:10
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:26
 msgid "Subversion readonly mirror"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:16
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:32
 msgid ""
 "This subversion repository is a svnsync readonly mirror. Nobody can "
@@ -450 +450 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:20
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:36
 msgid ""
 "Commit to the remote svn server, this repository is a readonly svn "
@@ -457 +457 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:51
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:67
 msgid "Readonly mirror enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:53
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:69
 msgid "Readonly mirror disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:55
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:71
 msgid "Admin user: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:77
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:93
 msgid "Enable readonly mirror: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:85
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:101
 msgid "Svnsync administrator: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:95
+#: pysvnmanager/hooks/plugins/__init__.py:111
 #, python-format
 msgid "repos '%s' not exist!"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:152
+#: pysvnmanager/hooks/plugins/__init__.py:168
 #, python-format
 msgid "Conflict: plugin '%s' is modified by others."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:182
-#: pysvnmanager/hooks/plugins/__init__.py:209
-#: pysvnmanager/hooks/plugins/__init__.py:215
-#: pysvnmanager/hooks/plugins/__init__.py:234
-#: pysvnmanager/hooks/plugins/__init__.py:332
-#: pysvnmanager/hooks/plugins/__init__.py:339
+#: pysvnmanager/hooks/plugins/__init__.py:198
+#: pysvnmanager/hooks/plugins/__init__.py:225
+#: pysvnmanager/hooks/plugins/__init__.py:231
+#: pysvnmanager/hooks/plugins/__init__.py:250
 #: pysvnmanager/hooks/plugins/__init__.py:348
+#: pysvnmanager/hooks/plugins/__init__.py:355
+#: pysvnmanager/hooks/plugins/__init__.py:364
 msgid "Plugin not fully implemented."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:313
+#: pysvnmanager/hooks/plugins/__init__.py:329
 msgid "Name"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:315
+#: pysvnmanager/hooks/plugins/__init__.py:331
 msgid "Description"
 msgstr ""
 
-#: pysvnmanager/model/repos.py:39
+#: pysvnmanager/model/repos.py:55
 #, python-format
 msgid "Repos root does not exist: %s"
 msgstr ""
 
-#: pysvnmanager/model/repos.py:68
+#: pysvnmanager/model/repos.py:84
 #, python-format
 msgid "Repos %s already exists."
 msgstr ""
 
-#: pysvnmanager/model/repos.py:139
+#: pysvnmanager/model/repos.py:166
 #, python-format
 msgid "Repos %s is not a blank repository."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:61
+#: pysvnmanager/model/svnauthz.py:77
 msgid "Name is not given."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:63
+#: pysvnmanager/model/svnauthz.py:79
 msgid "Name is not string."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:67
+#: pysvnmanager/model/svnauthz.py:83
 #, python-format
 msgid "Name (%s) contains invalid characters."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:475
+#: pysvnmanager/model/svnauthz.py:491
 #, python-format
 msgid "Recursive group membership for %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:569
+#: pysvnmanager/model/svnauthz.py:585
 #, python-format
 msgid "Not a valid username: %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:686
+#: pysvnmanager/model/svnauthz.py:702
 #, python-format
 msgid "Group %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1232
+#: pysvnmanager/model/svnauthz.py:1248
 msgid "Update failed! You are working on a out-of-date revision."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1486 pysvnmanager/model/svnauthz.py:1493
-#: pysvnmanager/model/svnauthz.py:1497
+#: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509
+#: pysvnmanager/model/svnauthz.py:1513
 #, python-format
 msgid "Unknown rule format: %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1511
+#: pysvnmanager/model/svnauthz.py:1527
 #, python-format
 msgid "No module exist for %s:%s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1621
+#: pysvnmanager/model/svnauthz.py:1637
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1633
+#: pysvnmanager/model/svnauthz.py:1649
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1769
+#: pysvnmanager/model/svnauthz.py:1785
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1771
+#: pysvnmanager/model/svnauthz.py:1787
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1773
+#: pysvnmanager/model/svnauthz.py:1789
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1813
+#: pysvnmanager/model/svnauthz.py:1829
 #, python-format
 msgid ""
@@ -600 +600 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1832
+#: pysvnmanager/model/svnauthz.py:1848
 #, python-format
 msgid ""
@@ -764 +764 @@
 
 #: pysvnmanager/templates/authz/index.mako:678
-#: pysvnmanager/templates/role/index.mako:711
+#: pysvnmanager/templates/role/index.mako:708
 msgid "Save"
 msgstr ""
 
 #: pysvnmanager/templates/authz/index.mako:679
-#: pysvnmanager/templates/role/index.mako:712
+#: pysvnmanager/templates/role/index.mako:709
 msgid "Delete"
 msgstr ""
 
 #: pysvnmanager/templates/authz/index.mako:680
-#: pysvnmanager/templates/role/index.mako:713
+#: pysvnmanager/templates/role/index.mako:710
 msgid "Cancel"
 msgstr ""
@@ -780 +780 @@
 #: pysvnmanager/templates/check/index.mako:5
 #: pysvnmanager/templates/check/index.mako:106
-#: pysvnmanager/templates/check/index.mako:176
+#: pysvnmanager/templates/check/index.mako:173
 msgid "Check Permissions"
 msgstr ""
@@ -812 +812 @@
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:139
-#: pysvnmanager/templates/check/index.mako:152
-#: pysvnmanager/templates/check/index.mako:164
+#: pysvnmanager/templates/check/index.mako:138
+#: pysvnmanager/templates/check/index.mako:149
+#: pysvnmanager/templates/check/index.mako:161
 msgid "Manual input"
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:146
+#: pysvnmanager/templates/check/index.mako:145
 msgid "Select repository"
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:160
+#: pysvnmanager/templates/check/index.mako:157
 msgid "Select module"
 msgstr ""
@@ -950 +950 @@
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:636
+#: pysvnmanager/templates/role/index.mako:634
 msgid "New Group"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:637
+#: pysvnmanager/templates/role/index.mako:635
 msgid "New Alias"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:641
+#: pysvnmanager/templates/role/index.mako:639
 msgid "New group name:"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:645
+#: pysvnmanager/templates/role/index.mako:643
 msgid "New alias name:"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:657
+#: pysvnmanager/templates/role/index.mako:655
 msgid "Members list"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:662
+#: pysvnmanager/templates/role/index.mako:660
 msgid "Other users"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:681
+#: pysvnmanager/templates/role/index.mako:679
 msgid "Ignore recursive"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:693
+#: pysvnmanager/templates/role/index.mako:691
 msgid "User name:"
 msgstr ""
 
-#~ msgid ""
-#~ "Subversion services may host on a filename case-sensitive OS,\n"
-#~ "while client **may not** (Windows is "
-#~ "case-insensitive). This may cause "
-#~ "'clash'.\n"
-#~ "    \n"
-#~ "- Detects new paths that 'clash' with existing, or other new, paths.\n"
-#~ "- Ignores existings paths that already 'clash'\n"
-#~ "- Exits with an error code, and a diagnostic on stderr, if 'clashes'\n"
-#~ "  are detected.\n"
-#~ msgstr ""
-

trunk/pysvnmanager/i18n/pysvnmanager.pot

@@ -7 +7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: pySvnManager 0.2.0\n"
+"Project-Id-Version: pySvnManager 0.2.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-08-28 19:02+0800\n"
+"POT-Creation-Date: 2008-08-30 13:12+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -16 +16 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.2\n"
-
-#: pysvnmanager/controllers/authz.py:43 pysvnmanager/templates/authz/index.mako:152
+"Generated-By: Babel 0.9.4\n"
+
+#: pysvnmanager/controllers/authz.py:60 pysvnmanager/templates/authz/index.mako:152
 #: pysvnmanager/templates/check/index.mako:10
 msgid "All users(with anon)"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:44 pysvnmanager/templates/authz/index.mako:154
+#: pysvnmanager/controllers/authz.py:61 pysvnmanager/templates/authz/index.mako:154
 #: pysvnmanager/templates/check/index.mako:11
 msgid "Known users"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:45 pysvnmanager/templates/authz/index.mako:156
+#: pysvnmanager/controllers/authz.py:62 pysvnmanager/templates/authz/index.mako:156
 #: pysvnmanager/templates/check/index.mako:12
 msgid "Anonymous"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:50 pysvnmanager/controllers/role.py:50
-#: pysvnmanager/controllers/role.py:70 pysvnmanager/templates/authz/index.mako:148
+#: pysvnmanager/controllers/authz.py:67 pysvnmanager/controllers/role.py:67
+#: pysvnmanager/controllers/role.py:87 pysvnmanager/templates/authz/index.mako:148
 #: pysvnmanager/templates/check/index.mako:17
 #: pysvnmanager/templates/role/index.mako:18
@@ -43 +43 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:53 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:72 pysvnmanager/templates/authz/index.mako:150
+#: pysvnmanager/controllers/authz.py:70 pysvnmanager/controllers/role.py:72
+#: pysvnmanager/controllers/role.py:89 pysvnmanager/templates/authz/index.mako:150
 #: pysvnmanager/templates/check/index.mako:19
 #: pysvnmanager/templates/role/index.mako:23
@@ -53 +53 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:68 pysvnmanager/controllers/authz.py:99
-#: pysvnmanager/controllers/check.py:89 pysvnmanager/controllers/repos.py:40
-#: pysvnmanager/controllers/repos.py:59 pysvnmanager/controllers/role.py:43
+#: pysvnmanager/controllers/authz.py:85 pysvnmanager/controllers/authz.py:116
+#: pysvnmanager/controllers/check.py:106 pysvnmanager/controllers/repos.py:57
+#: pysvnmanager/controllers/repos.py:76 pysvnmanager/controllers/role.py:60
 #: pysvnmanager/templates/check/index.mako:9
 #: pysvnmanager/templates/check/index.mako:23
@@ -63 +63 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:177
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:173
+#: pysvnmanager/controllers/authz.py:190
 #, python-format
 msgid "Repository %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:181
+#: pysvnmanager/controllers/authz.py:198
 #, python-format
 msgid "Module %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:187
+#: pysvnmanager/controllers/authz.py:204
 msgid "You can not delete yourself from admin list."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:212
+#: pysvnmanager/controllers/authz.py:229
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/check.py:69 pysvnmanager/templates/auth_failed.mako:3
+#: pysvnmanager/controllers/check.py:86 pysvnmanager/templates/auth_failed.mako:3
 msgid "Permission denied."
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:50
+#: pysvnmanager/controllers/logs.py:68
 msgid "Rev"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:51
+#: pysvnmanager/controllers/logs.py:69
 msgid "Who"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:52
+#: pysvnmanager/controllers/logs.py:70
 msgid "When"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:53
+#: pysvnmanager/controllers/logs.py:71
 msgid "Why"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:54
+#: pysvnmanager/controllers/logs.py:72
 msgid "Compare"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:97
+#: pysvnmanager/controllers/logs.py:115
 msgid "Page: "
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:133
+#: pysvnmanager/controllers/logs.py:151
 msgid "Compares between"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:152
+#: pysvnmanager/controllers/logs.py:170
 #, python-format
 msgid "Rollback successfully to revision: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/logs.py:161
+#: pysvnmanager/controllers/logs.py:179
 #, python-format
 msgid "Rollback failed: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:74
+#: pysvnmanager/controllers/repos.py:91
 msgid "Installed hooks:"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:80
+#: pysvnmanager/controllers/repos.py:97
 msgid "Id"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:81
+#: pysvnmanager/controllers/repos.py:98
 msgid "Plugin name"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:82 pysvnmanager/hooks/plugins/__init__.py:314
+#: pysvnmanager/controllers/repos.py:99 pysvnmanager/hooks/plugins/__init__.py:330
 msgid "Type"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:96
+#: pysvnmanager/controllers/repos.py:113
 msgid "Remove selected hooks"
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:119
+#: pysvnmanager/controllers/repos.py:136
 #, python-format
 msgid ""
@@ -156 +156 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:122
+#: pysvnmanager/controllers/repos.py:139
 #, python-format
 msgid "Apply plugin '%(plugin)s' on '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:143
+#: pysvnmanager/controllers/repos.py:160
 #, python-format
 msgid ""
@@ -168 +168 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:146
+#: pysvnmanager/controllers/repos.py:163
 #, python-format
 msgid "Delete plugin '%(plugin)s' on '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:149
+#: pysvnmanager/controllers/repos.py:166
 #, python-format
 msgid "No plugin has been deleted for '%(repos)s'."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:158
+#: pysvnmanager/controllers/repos.py:175
 #, python-format
 msgid ""
@@ -185 +185 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:161
+#: pysvnmanager/controllers/repos.py:178
 #, python-format
 msgid "Create repository '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:174
+#: pysvnmanager/controllers/repos.py:191
 #, python-format
 msgid ""
@@ -197 +197 @@
 msgstr ""
 
-#: pysvnmanager/controllers/repos.py:177
+#: pysvnmanager/controllers/repos.py:194
 #, python-format
 msgid "Delete blank repository '%(repos)s' success."
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:103
+#: pysvnmanager/controllers/role.py:120
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:123
+#: pysvnmanager/controllers/role.py:140
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:145
+#: pysvnmanager/controllers/role.py:162
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:165
+#: pysvnmanager/controllers/role.py:182
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:34
+#: pysvnmanager/controllers/security.py:52
 #, python-format
 msgid "User %s logged in"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:45
+#: pysvnmanager/controllers/security.py:63
 #, python-format
 msgid "Login failed for user: %s"
 msgstr ""
 
-#: pysvnmanager/controllers/security.py:53
+#: pysvnmanager/controllers/security.py:71
 #, python-format
 msgid "User %s logged out"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:10
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:26
 msgid "Allow revprop change"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:16
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:32
 msgid "Allow user change commit-log or other rev-properties."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:19
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:35
 msgid ""
 "Commit-log is the only rev-prop we allow to change. Because the changes of "
@@ -252 +252 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:10
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:26
 msgid "Mantis bugtracking integration"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:16
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:32
 msgid ""
 "Integration Subversion with Mantis bugtracking. If commit-log has proper "
@@ -263 +263 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:10
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:26
 msgid "Subversion client version check (>1.5.0)"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:16
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:32
 msgid "Check subversion client version. if version below 1.5.0, checkin denied."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:19
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:35
 msgid ""
 "SVN below 1.5.0 can not handle mergeinfo properly.It can mess up our "
@@ -277 +277 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:10
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:26
 msgid "Detect case-insensitive filename clashes"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:16
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:32
 msgid "A pre-commit hook to detect case-insensitive filename clashes."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:19
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:35
 msgid ""
 "Subversion services may host on a filename case-sensitive OS,\n"
@@ -297 +297 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:11
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:27
 msgid "Check commit log message"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:17
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:33
 msgid "User must provide commit-log message when checkin."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:50
-#: pysvnmanager/hooks/plugins/EmailNotify.py:73
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:49
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:66
+#: pysvnmanager/hooks/plugins/EmailNotify.py:89
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
 msgid "Current configuration"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:52
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:68
 msgid "Commit log check is enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:54
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:70
 msgid "Commit log check is disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:56
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:95
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:72
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:111
 msgid "Minimal size of commit log: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:61
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:101
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:77
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:117
 msgid "Pattern which commit log must match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:64
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:80
 msgid "Pattern which commit log must **NOT** match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:83
-#: pysvnmanager/hooks/plugins/EmailNotify.py:97
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:73
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:99
+#: pysvnmanager/hooks/plugins/EmailNotify.py:113
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:89
 msgid "Fill this form"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:87
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:103
 msgid "Enable commit log check: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:90
-#: pysvnmanager/hooks/plugins/EmailNotify.py:104
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:80
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:106
+#: pysvnmanager/hooks/plugins/EmailNotify.py:120
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:96
 msgid "Enable"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:92
-#: pysvnmanager/hooks/plugins/EmailNotify.py:106
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:82
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:108
+#: pysvnmanager/hooks/plugins/EmailNotify.py:122
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
 msgid "Disable"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:107
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:123
 msgid "Pattern which commit log must <b>NOT</b> match against: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:140
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:156
 msgid "Commit log size must > 0."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:11
+#: pysvnmanager/hooks/plugins/EmailNotify.py:27
 msgid "Send email notify for commit event"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:17
+#: pysvnmanager/hooks/plugins/EmailNotify.py:33
 msgid ""
 "Send a notification email describing either a commit or a revprop-change "
@@ -373 +373 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:21
+#: pysvnmanager/hooks/plugins/EmailNotify.py:37
 msgid ""
 "\n"
@@ -399 +399 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:75
+#: pysvnmanager/hooks/plugins/EmailNotify.py:91
 msgid "Email notify enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:77
+#: pysvnmanager/hooks/plugins/EmailNotify.py:93
 msgid "Email notify disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:79
+#: pysvnmanager/hooks/plugins/EmailNotify.py:95
 msgid "Parameters: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:101
+#: pysvnmanager/hooks/plugins/EmailNotify.py:117
 msgid "Enable email notify."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:109
+#: pysvnmanager/hooks/plugins/EmailNotify.py:125
 msgid "Input email notify configurations: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:139
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:115
+#: pysvnmanager/hooks/plugins/EmailNotify.py:155
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:131
 msgid "Wrong configuration."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:10
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:26
 msgid "mime-type and eol-style check"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:16
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:32
 msgid "New file must provide svn:eol-style if not binary file."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:10
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:26
 msgid "Subversion readonly mirror"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:16
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:32
 msgid ""
 "This subversion repository is a svnsync readonly mirror. Nobody can checkin, "
@@ -442 +442 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:20
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:36
 msgid ""
 "Commit to the remote svn server, this repository is a readonly svn mirror.It "
@@ -448 +448 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:51
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:67
 msgid "Readonly mirror enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:53
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:69
 msgid "Readonly mirror disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:55
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:71
 msgid "Admin user: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:77
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:93
 msgid "Enable readonly mirror: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:85
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:101
 msgid "Svnsync administrator: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:95
+#: pysvnmanager/hooks/plugins/__init__.py:111
 #, python-format
 msgid "repos '%s' not exist!"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:152
+#: pysvnmanager/hooks/plugins/__init__.py:168
 #, python-format
 msgid "Conflict: plugin '%s' is modified by others."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:182
-#: pysvnmanager/hooks/plugins/__init__.py:209
-#: pysvnmanager/hooks/plugins/__init__.py:215
-#: pysvnmanager/hooks/plugins/__init__.py:234
-#: pysvnmanager/hooks/plugins/__init__.py:332
-#: pysvnmanager/hooks/plugins/__init__.py:339
+#: pysvnmanager/hooks/plugins/__init__.py:198
+#: pysvnmanager/hooks/plugins/__init__.py:225
+#: pysvnmanager/hooks/plugins/__init__.py:231
+#: pysvnmanager/hooks/plugins/__init__.py:250
 #: pysvnmanager/hooks/plugins/__init__.py:348
+#: pysvnmanager/hooks/plugins/__init__.py:355
+#: pysvnmanager/hooks/plugins/__init__.py:364
 msgid "Plugin not fully implemented."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:313
+#: pysvnmanager/hooks/plugins/__init__.py:329
 msgid "Name"
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/__init__.py:315
+#: pysvnmanager/hooks/plugins/__init__.py:331
 msgid "Description"
 msgstr ""
 
-#: pysvnmanager/model/repos.py:39
+#: pysvnmanager/model/repos.py:55
 #, python-format
 msgid "Repos root does not exist: %s"
 msgstr ""
 
-#: pysvnmanager/model/repos.py:68
+#: pysvnmanager/model/repos.py:84
 #, python-format
 msgid "Repos %s already exists."
 msgstr ""
 
-#: pysvnmanager/model/repos.py:139
+#: pysvnmanager/model/repos.py:166
 #, python-format
 msgid "Repos %s is not a blank repository."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:61
+#: pysvnmanager/model/svnauthz.py:77
 msgid "Name is not given."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:63
+#: pysvnmanager/model/svnauthz.py:79
 msgid "Name is not string."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:67
+#: pysvnmanager/model/svnauthz.py:83
 #, python-format
 msgid "Name (%s) contains invalid characters."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:475
+#: pysvnmanager/model/svnauthz.py:491
 #, python-format
 msgid "Recursive group membership for %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:569
+#: pysvnmanager/model/svnauthz.py:585
 #, python-format
 msgid "Not a valid username: %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:686
+#: pysvnmanager/model/svnauthz.py:702
 #, python-format
 msgid "Group %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1232
+#: pysvnmanager/model/svnauthz.py:1248
 msgid "Update failed! You are working on a out-of-date revision."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1486 pysvnmanager/model/svnauthz.py:1493
-#: pysvnmanager/model/svnauthz.py:1497
+#: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509
+#: pysvnmanager/model/svnauthz.py:1513
 #, python-format
 msgid "Unknown rule format: %s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1511
+#: pysvnmanager/model/svnauthz.py:1527
 #, python-format
 msgid "No module exist for %s:%s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1621
+#: pysvnmanager/model/svnauthz.py:1637
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1633
+#: pysvnmanager/model/svnauthz.py:1649
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1769
+#: pysvnmanager/model/svnauthz.py:1785
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1771
+#: pysvnmanager/model/svnauthz.py:1787
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1773
+#: pysvnmanager/model/svnauthz.py:1789
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1813
+#: pysvnmanager/model/svnauthz.py:1829
 #, python-format
 msgid ""
@@ -591 +591 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1832
+#: pysvnmanager/model/svnauthz.py:1848
 #, python-format
 msgid ""
@@ -753 +753 @@
 
 #: pysvnmanager/templates/authz/index.mako:678
-#: pysvnmanager/templates/role/index.mako:711
+#: pysvnmanager/templates/role/index.mako:708
 msgid "Save"
 msgstr ""
 
 #: pysvnmanager/templates/authz/index.mako:679
-#: pysvnmanager/templates/role/index.mako:712
+#: pysvnmanager/templates/role/index.mako:709
 msgid "Delete"
 msgstr ""
 
 #: pysvnmanager/templates/authz/index.mako:680
-#: pysvnmanager/templates/role/index.mako:713
+#: pysvnmanager/templates/role/index.mako:710
 msgid "Cancel"
 msgstr ""
@@ -769 +769 @@
 #: pysvnmanager/templates/check/index.mako:5
 #: pysvnmanager/templates/check/index.mako:106
-#: pysvnmanager/templates/check/index.mako:176
+#: pysvnmanager/templates/check/index.mako:173
 msgid "Check Permissions"
 msgstr ""
@@ -801 +801 @@
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:139
-#: pysvnmanager/templates/check/index.mako:152
-#: pysvnmanager/templates/check/index.mako:164
+#: pysvnmanager/templates/check/index.mako:138
+#: pysvnmanager/templates/check/index.mako:149
+#: pysvnmanager/templates/check/index.mako:161
 msgid "Manual input"
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:146
+#: pysvnmanager/templates/check/index.mako:145
 msgid "Select repository"
 msgstr ""
 
-#: pysvnmanager/templates/check/index.mako:160
+#: pysvnmanager/templates/check/index.mako:157
 msgid "Select module"
 msgstr ""
@@ -939 +939 @@
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:636
+#: pysvnmanager/templates/role/index.mako:634
 msgid "New Group"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:637
+#: pysvnmanager/templates/role/index.mako:635
 msgid "New Alias"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:641
+#: pysvnmanager/templates/role/index.mako:639
 msgid "New group name:"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:645
+#: pysvnmanager/templates/role/index.mako:643
 msgid "New alias name:"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:657
+#: pysvnmanager/templates/role/index.mako:655
 msgid "Members list"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:662
+#: pysvnmanager/templates/role/index.mako:660
 msgid "Other users"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:681
+#: pysvnmanager/templates/role/index.mako:679
 msgid "Ignore recursive"
 msgstr ""
 
-#: pysvnmanager/templates/role/index.mako:693
+#: pysvnmanager/templates/role/index.mako:691
 msgid "User name:"
 msgstr ""

trunk/pysvnmanager/i18n/zh/LC_MESSAGES/pysvnmanager.po

@@ -9 +9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: pysvnmanager\n"
+"Project-Id-Version:  pysvnmanager\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-08-28 19:04+0800\n"
+"PO-Revision-Date: 2008-08-30 13:12+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
-"Language-Team:  <zh@li.org>\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION\n"
+"Language-Team: <zh@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.2\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: pysvnmanager/controllers/authz.py:43
+"Generated-By: Babel 0.9.4\n"
+
+#: pysvnmanager/controllers/authz.py:60
 #: pysvnmanager/templates/authz/index.mako:152
 #: pysvnmanager/templates/check/index.mako:10
@@ -28 +27 @@
 msgstr "所有用户(含匿名)"
 
-#: pysvnmanager/controllers/authz.py:44
+#: pysvnmanager/controllers/authz.py:61
 #: pysvnmanager/templates/authz/index.mako:154
 #: pysvnmanager/templates/check/index.mako:11
@@ -34 +33 @@
 msgstr "注册用户"
 
-#: pysvnmanager/controllers/authz.py:45
+#: pysvnmanager/controllers/authz.py:62
 #: pysvnmanager/templates/authz/index.mako:156
 #: pysvnmanager/templates/check/index.mako:12
@@ -40 +39 @@
 msgstr "匿名用户"
 
-#: pysvnmanager/controllers/authz.py:50 pysvnmanager/controllers/role.py:50
-#: pysvnmanager/controllers/role.py:70
+#: pysvnmanager/controllers/authz.py:67 pysvnmanager/controllers/role.py:67
+#: pysvnmanager/controllers/role.py:87
 #: pysvnmanager/templates/authz/index.mako:148
 #: pysvnmanager/templates/check/index.mako:17
@@ -51 +50 @@
 msgstr "团队:"
 
-#: pysvnmanager/controllers/authz.py:53 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:72
+#: pysvnmanager/controllers/authz.py:70 pysvnmanager/controllers/role.py:72
+#: pysvnmanager/controllers/role.py:89
 #: pysvnmanager/templates/authz/index.mako:150
 #: pysvnmanager/templates/check/index.mako:19
@@ -62 +61 @@
 msgstr "别名:"
 
-#: pysvnmanager/controllers/authz.py:68 pysvnmanager/controllers/authz.py:99
-#: pysvnmanager/controllers/check.py:89 pysvnmanager/controllers/repos.py:40
-#: pysvnmanager/controllers/repos.py:59 pysvnmanager/controllers/role.py:43
+#: pysvnmanager/controllers/authz.py:85 pysvnmanager/controllers/authz.py:116
+#: pysvnmanager/controllers/check.py:106 pysvnmanager/controllers/repos.py:57
+#: pysvnmanager/controllers/repos.py:76 pysvnmanager/controllers/role.py:60
 #: pysvnmanager/templates/check/index.mako:9
 #: pysvnmanager/templates/check/index.mako:23
@@ -72 +71 @@
 msgstr "请选择..."
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:177
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s)"
 msgstr "用户 %(user)s 修改了授权策略。(rev:%(rev)s)"
 
-#: pysvnmanager/controllers/authz.py:173
+#: pysvnmanager/controllers/authz.py:190
 #, python-format
 msgid "Repository %s not exist."
 msgstr "版本库 %s 不存在。"
 
-#: pysvnmanager/controllers/authz.py:181
+#: pysvnmanager/controllers/authz.py:198
 #, python-format
 msgid "Module %s not exist."
 msgstr "模组 %s 不存在。"
 
-#: pysvnmanager/controllers/authz.py:187
+#: pysvnmanager/controllers/authz.py:204
 msgid "You can not delete yourself from admin list."
 msgstr "您不能将自己从管理员列表中删除。"
 
-#: pysvnmanager/controllers/authz.py:212
+#: pysvnmanager/controllers/authz.py:229
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s)"
 msgstr "用户 %(user)s 删除了授权策略。(rev:%(rev)s)"
 
-#: pysvnmanager/controllers/check.py:69
+#: pysvnmanager/controllers/check.py:86
 #: pysvnmanager/templates/auth_failed.mako:3
 msgid "Permission denied."
 msgstr "没有权限。"
 
-#: pysvnmanager/controllers/logs.py:50
+#: pysvnmanager/controllers/logs.py:68
 msgid "Rev"
 msgstr "版本"
 
-#: pysvnmanager/controllers/logs.py:51
+#: pysvnmanager/controllers/logs.py:69
 msgid "Who"
 msgstr "管理员"
 
-#: pysvnmanager/controllers/logs.py:52
+#: pysvnmanager/controllers/logs.py:70
 msgid "When"
 msgstr "时间"
 
-#: pysvnmanager/controllers/logs.py:53
+#: pysvnmanager/controllers/logs.py:71
 msgid "Why"
 msgstr "说明"
 
-#: pysvnmanager/controllers/logs.py:54
+#: pysvnmanager/controllers/logs.py:72
 msgid "Compare"
 msgstr "比较"
 
-#: pysvnmanager/controllers/logs.py:97
+#: pysvnmanager/controllers/logs.py:115
 msgid "Page: "
 msgstr "页面: "
 
-#: pysvnmanager/controllers/logs.py:133
+#: pysvnmanager/controllers/logs.py:151
 msgid "Compares between"
 msgstr "版本间比较"
 
-#: pysvnmanager/controllers/logs.py:152
+#: pysvnmanager/controllers/logs.py:170
 #, python-format
 msgid "Rollback successfully to revision: %s"
 msgstr "成功回滚至版本: %s"
 
-#: pysvnmanager/controllers/logs.py:161
+#: pysvnmanager/controllers/logs.py:179
 #, python-format
 msgid "Rollback failed: %s"
 msgstr "回滚失败: %s"
 
-#: pysvnmanager/controllers/repos.py:74
+#: pysvnmanager/controllers/repos.py:91
 msgid "Installed hooks:"
 msgstr "已安装插件："
 
-#: pysvnmanager/controllers/repos.py:80
+#: pysvnmanager/controllers/repos.py:97
 msgid "Id"
 msgstr "Id"
 
-#: pysvnmanager/controllers/repos.py:81
+#: pysvnmanager/controllers/repos.py:98
 msgid "Plugin name"
 msgstr "插件名称"
 
-#: pysvnmanager/controllers/repos.py:82
-#: pysvnmanager/hooks/plugins/__init__.py:314
+#: pysvnmanager/controllers/repos.py:99
+#: pysvnmanager/hooks/plugins/__init__.py:330
 msgid "Type"
 msgstr "类型"
 
-#: pysvnmanager/controllers/repos.py:96
+#: pysvnmanager/controllers/repos.py:113
 msgid "Remove selected hooks"
 msgstr "删除选择的插件"
 
-#: pysvnmanager/controllers/repos.py:119
+#: pysvnmanager/controllers/repos.py:136
 #, python-format
 msgid ""
@@ -169 +168 @@
 "%(msg)s"
 
-#: pysvnmanager/controllers/repos.py:122
+#: pysvnmanager/controllers/repos.py:139
 #, python-format
 msgid "Apply plugin '%(plugin)s' on '%(repos)s' success."
 msgstr "成功启用版本库'%(repos)s'的插件'%(plugin)s'。 "
 
-#: pysvnmanager/controllers/repos.py:143
+#: pysvnmanager/controllers/repos.py:160
 #, python-format
 msgid ""
@@ -183 +182 @@
 "%(msg)s"
 
-#: pysvnmanager/controllers/repos.py:146
+#: pysvnmanager/controllers/repos.py:163
 #, python-format
 msgid "Delete plugin '%(plugin)s' on '%(repos)s' success."
 msgstr "成功删除版本库'%(repos)s'的插件'%(plugin)s'。"
 
-#: pysvnmanager/controllers/repos.py:149
+#: pysvnmanager/controllers/repos.py:166
 #, python-format
 msgid "No plugin has been deleted for '%(repos)s'."
 msgstr "未删除版本库'%(repos)s'的插件。"
 
-#: pysvnmanager/controllers/repos.py:158
+#: pysvnmanager/controllers/repos.py:175
 #, python-format
 msgid ""
@@ -202 +201 @@
 "%(msg)s"
 
-#: pysvnmanager/controllers/repos.py:161
+#: pysvnmanager/controllers/repos.py:178
 #, python-format
 msgid "Create repository '%(repos)s' success."
 msgstr "成功创建版本库'%(repos)s'。"
 
-#: pysvnmanager/controllers/repos.py:174
+#: pysvnmanager/controllers/repos.py:191
 #, python-format
 msgid ""
@@ -216 +215 @@
 "%(msg)s"
 
-#: pysvnmanager/controllers/repos.py:177
+#: pysvnmanager/controllers/repos.py:194
 #, python-format
 msgid "Delete blank repository '%(repos)s' success."
 msgstr "成功删除版本库'%(repos)s'。"
 
-#: pysvnmanager/controllers/role.py:103
+#: pysvnmanager/controllers/role.py:120
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s)"
 msgstr "用户 %(user)s 修改用户组: %(grp)s。(rev:%(rev)s)"
 
-#: pysvnmanager/controllers/role.py:123
+#: pysvnmanager/controllers/role.py:140
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s)"
 msgstr "用户 %(user)s 删除用户组: %(grp)s。(rev:%(rev)s)"
 
-#: pysvnmanager/controllers/role.py:145
+#: pysvnmanager/controllers/role.py:162
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s)"
 msgstr "用户 %(user)s 修改别名: %(alias)s。(rev:%(rev)s)"
 
-#: pysvnmanager/controllers/role.py:165
+#: pysvnmanager/controllers/role.py:182
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr "用户 %(user)s 删除别名: %(alias)s。(rev:%(rev)s,%(msg)s)"
 
-#: pysvnmanager/controllers/security.py:34
+#: pysvnmanager/controllers/security.py:52
 #, python-format
 msgid "User %s logged in"
 msgstr "用户 %s 登录"
 
-#: pysvnmanager/controllers/security.py:45
+#: pysvnmanager/controllers/security.py:63
 #, python-format
 msgid "Login failed for user: %s"
 msgstr "以 %s 身份登录失败"
 
-#: pysvnmanager/controllers/security.py:53
+#: pysvnmanager/controllers/security.py:71
 #, python-format
 msgid "User %s logged out"
 msgstr "用户 %s 登出"
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:10
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:26
 msgid "Allow revprop change"
 msgstr "允许修改版本属性"
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:16
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:32
 msgid "Allow user change commit-log or other rev-properties."
 msgstr "允许用户修改提交说明等版本属性"
 
-#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:19
+#: pysvnmanager/hooks/plugins/AllowRevpropChange.py:35
 msgid ""
 "Commit-log is the only rev-prop we allow to change. Because the changes "
@@ -271 +270 @@
 msgstr "提交说明是我们唯一允许修改的版本属性。因为版本属性本身未被版本控制，修改版本属性是不可恢复的操作，所以管理员在启用本功能前，应该考虑设置变更通知以记录修改事件。"
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:10
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:26
 msgid "Mantis bugtracking integration"
 msgstr "整合 Mantis 缺陷跟踪系统"
 
-#: pysvnmanager/hooks/plugins/BugtrackMantis.py:16
+#: pysvnmanager/hooks/plugins/BugtrackMantis.py:32
 msgid ""
 "Integration Subversion with Mantis bugtracking. If commit-log has proper "
@@ -284 +283 @@
 "的状态修改为已修改，并将commit-log 以及代码变更添加到说明中。"
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:10
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:26
 msgid "Subversion client version check (>1.5.0)"
 msgstr "Subversion 客户端版本检查 (>1.5.0)"
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:16
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:32
 msgid "Check subversion client version. if version below 1.5.0, checkin denied."
 msgstr "检查 subversion 客户端版本。如果版本号小于 1.5.0，禁止客户端提交。"
 
-#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:19
+#: pysvnmanager/hooks/plugins/CapCheckMergeInfo.py:35
 msgid ""
 "SVN below 1.5.0 can not handle mergeinfo properly.It can mess up our "
@@ -298 +297 @@
 msgstr "小于 1.5.0 版本的 SVN 客户端不能正确处理 mergeinfo。会破坏自动的合并追踪功能！"
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:10
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:26
 msgid "Detect case-insensitive filename clashes"
 msgstr "检查大小写引起的文件名冲突"
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:16
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:32
 msgid "A pre-commit hook to detect case-insensitive filename clashes."
 msgstr "在 pre-commit 钩子中执行，检查文件名大小写引起的文件名冲突。"
 
-#: pysvnmanager/hooks/plugins/CaseInsensitive.py:19
+#: pysvnmanager/hooks/plugins/CaseInsensitive.py:35
 msgid ""
 "Subversion services may host on a filename case-sensitive OS,\n"
@@ -324 +323 @@
 "- 如果发现冲突，拒绝提交，并报错。\n"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:11
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:27
 msgid "Check commit log message"
 msgstr "检查提交说明"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:17
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:33
 msgid "User must provide commit-log message when checkin."
 msgstr "用户在代码提交时，必须提供提交说明。"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:50
-#: pysvnmanager/hooks/plugins/EmailNotify.py:73
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:49
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:66
+#: pysvnmanager/hooks/plugins/EmailNotify.py:89
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
 msgid "Current configuration"
 msgstr "当前设置"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:52
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:68
 msgid "Commit log check is enabled."
 msgstr "提交说明检查已经启用。"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:54
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:70
 msgid "Commit log check is disabled."
 msgstr "提交说明检查已经禁用。"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:56
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:95
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:72
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:111
 msgid "Minimal size of commit log: "
 msgstr "提交说明长度检查，最少："
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:61
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:101
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:77
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:117
 msgid "Pattern which commit log must match against: "
 msgstr "提交说明必须与该模板匹配："
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:64
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:80
 msgid "Pattern which commit log must **NOT** match against: "
 msgstr "提交说明 **不能** 出现类似内容："
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:83
-#: pysvnmanager/hooks/plugins/EmailNotify.py:97
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:73
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:99
+#: pysvnmanager/hooks/plugins/EmailNotify.py:113
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:89
 msgid "Fill this form"
 msgstr "填写表单"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:87
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:103
 msgid "Enable commit log check: "
 msgstr "启用提交说明检查："
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:90
-#: pysvnmanager/hooks/plugins/EmailNotify.py:104
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:80
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:106
+#: pysvnmanager/hooks/plugins/EmailNotify.py:120
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:96
 msgid "Enable"
 msgstr "启用"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:92
-#: pysvnmanager/hooks/plugins/EmailNotify.py:106
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:82
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:108
+#: pysvnmanager/hooks/plugins/EmailNotify.py:122
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
 msgid "Disable"
 msgstr "关闭"
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:107
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:123
 msgid "Pattern which commit log must <b>NOT</b> match against: "
 msgstr "提交说明<b>不能</b>出现类似内容："
 
-#: pysvnmanager/hooks/plugins/CommitLogCheck.py:140
+#: pysvnmanager/hooks/plugins/CommitLogCheck.py:156
 msgid "Commit log size must > 0."
 msgstr "提交说明最小长度阈值必须大于零。"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:11
+#: pysvnmanager/hooks/plugins/EmailNotify.py:27
 msgid "Send email notify for commit event"
 msgstr "针对代码变更发出邮件通知"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:17
+#: pysvnmanager/hooks/plugins/EmailNotify.py:33
 msgid ""
 "Send a notification email describing either a commit or a revprop-change "
@@ -400 +399 @@
 msgstr "当对 Subversion 代码库中的代码修改或者修改状态，发出邮件通知。"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:21
+#: pysvnmanager/hooks/plugins/EmailNotify.py:37
 msgid ""
 "\n"
@@ -446 +445 @@
 "--diff n              不包含代码差异（缺省包含）\n"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:75
+#: pysvnmanager/hooks/plugins/EmailNotify.py:91
 msgid "Email notify enabled."
 msgstr "邮件通知启用。"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:77
+#: pysvnmanager/hooks/plugins/EmailNotify.py:93
 msgid "Email notify disabled."
 msgstr "邮件通知关闭。"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:79
+#: pysvnmanager/hooks/plugins/EmailNotify.py:95
 msgid "Parameters: "
 msgstr "参数: "
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:101
+#: pysvnmanager/hooks/plugins/EmailNotify.py:117
 msgid "Enable email notify."
 msgstr "启用邮件通知。"
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:109
+#: pysvnmanager/hooks/plugins/EmailNotify.py:125
 msgid "Input email notify configurations: "
 msgstr "输入邮件通知配置参数： "
 
-#: pysvnmanager/hooks/plugins/EmailNotify.py:139
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:115
+#: pysvnmanager/hooks/plugins/EmailNotify.py:155
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:131
 msgid "Wrong configuration."
 msgstr "错误的配置"
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:10
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:26
 msgid "mime-type and eol-style check"
 msgstr "文件类型和换行符设置检查"
 
-#: pysvnmanager/hooks/plugins/EolStyleCheck.py:16
+#: pysvnmanager/hooks/plugins/EolStyleCheck.py:32
 msgid "New file must provide svn:eol-style if not binary file."
 msgstr "新增的文本文件，必须设置换行符。"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:10
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:26
 msgid "Subversion readonly mirror"
 msgstr "SVN 只读镜像"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:16
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:32
 msgid ""
 "This subversion repository is a svnsync readonly mirror. Nobody can "
@@ -489 +488 @@
 msgstr "本 SVN 版本库是一个 svnsync 的只读镜像。除了 svnsync 管理员，任何人都不能提交。"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:20
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:36
 msgid ""
 "Commit to the remote svn server, this repository is a readonly svn "
@@ -496 +495 @@
 msgstr "提交到远程的 SVN 服务器，本地服务器是一个只读的 SVN 镜像。同步远程与本地的 SVN 服务器，是管理员的职责。"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:51
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:67
 msgid "Readonly mirror enabled."
 msgstr "只读镜像启用。"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:53
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:69
 msgid "Readonly mirror disabled."
 msgstr "只读镜像关闭。"
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:55
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:71
 msgid "Admin user: "
 msgstr "管理员: "
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:77
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:93
 msgid "Enable readonly mirror: "
 msgstr "启用只读镜像："
 
-#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:85
+#: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:101
 msgid "Svnsync administrator: "
 msgstr "Svnsync 管理员:"
 
-#: pysvnmanager/hooks/plugins/__init__.py:95
+#: pysvnmanager/hooks/plugins/__init__.py:111
 #, python-format
 msgid "repos '%s' not exist!"
 msgstr "版本库 %s 不存在！"
 
-#: pysvnmanager/hooks/plugins/__init__.py:152
+#: pysvnmanager/hooks/plugins/__init__.py:168
 #, python-format
 msgid "Conflict: plugin '%s' is modified by others."
 msgstr "冲突：插件'%s'被其他人修改了。"
 
-#: pysvnmanager/hooks/plugins/__init__.py:182
-#: pysvnmanager/hooks/plugins/__init__.py:209
-#: pysvnmanager/hooks/plugins/__init__.py:215
-#: pysvnmanager/hooks/plugins/__init__.py:234
-#: pysvnmanager/hooks/plugins/__init__.py:332
-#: pysvnmanager/hooks/plugins/__init__.py:339
+#: pysvnmanager/hooks/plugins/__init__.py:198
+#: pysvnmanager/hooks/plugins/__init__.py:225
+#: pysvnmanager/hooks/plugins/__init__.py:231
+#: pysvnmanager/hooks/plugins/__init__.py:250
 #: pysvnmanager/hooks/plugins/__init__.py:348
+#: pysvnmanager/hooks/plugins/__init__.py:355
+#: pysvnmanager/hooks/plugins/__init__.py:364
 msgid "Plugin not fully implemented."
 msgstr "插件未完全实现。"
 
-#: pysvnmanager/hooks/plugins/__init__.py:313
+#: pysvnmanager/hooks/plugins/__init__.py:329
 msgid "Name"
 msgstr "名称"
 
-#: pysvnmanager/hooks/plugins/__init__.py:315
+#: pysvnmanager/hooks/plugins/__init__.py:331
 msgid "Description"
 msgstr "说明"
 
-#: pysvnmanager/model/repos.py:39
+#: pysvnmanager/model/repos.py:55
 #, python-format
 msgid "Repos root does not exist: %s"
 msgstr "版本库根不存在：%s"
 
-#: pysvnmanager/model/repos.py:68
+#: pysvnmanager/model/repos.py:84
 #, python-format
 msgid "Repos %s already exists."
 msgstr "版本库 %s 已经存在。"
 
-#: pysvnmanager/model/repos.py:139
+#: pysvnmanager/model/repos.py:166
 #, python-format
 msgid "Repos %s is not a blank repository."
 msgstr "版本库 %s 不是一个空的版本库。"
 
-#: pysvnmanager/model/svnauthz.py:61
+#: pysvnmanager/model/svnauthz.py:77
 msgid "Name is not given."
 msgstr "未能提供名称。"
 
-#: pysvnmanager/model/svnauthz.py:63
+#: pysvnmanager/model/svnauthz.py:79
 msgid "Name is not string."
 msgstr "名称不是字符串"
 
-#: pysvnmanager/model/svnauthz.py:67
+#: pysvnmanager/model/svnauthz.py:83
 #, python-format
 msgid "Name (%s) contains invalid characters."
 msgstr "名称(%s)中包含非法字符。"
 
-#: pysvnmanager/model/svnauthz.py:475
+#: pysvnmanager/model/svnauthz.py:491
 #, python-format
 msgid "Recursive group membership for %s"
 msgstr "%s 出现了循环组引用。"
 
-#: pysvnmanager/model/svnauthz.py:569
+#: pysvnmanager/model/svnauthz.py:585
 #, python-format
 msgid "Not a valid username: %s"
 msgstr "非法用户名: %s"
 
-#: pysvnmanager/model/svnauthz.py:686
+#: pysvnmanager/model/svnauthz.py:702
 #, python-format
 msgid "Group %s is referenced by group %s."
 msgstr "用户组 %s 被组 %s 引用。"
 
-#: pysvnmanager/model/svnauthz.py:1232
+#: pysvnmanager/model/svnauthz.py:1248
 msgid "Update failed! You are working on a out-of-date revision."
 msgstr "更新失败！您的更改是基于一个过期的版本，请先刷新再更改。"
 
-#: pysvnmanager/model/svnauthz.py:1486 pysvnmanager/model/svnauthz.py:1493
-#: pysvnmanager/model/svnauthz.py:1497
+#: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509
+#: pysvnmanager/model/svnauthz.py:1513
 #, python-format
 msgid "Unknown rule format: %s"
 msgstr "未知策略格式: %s"
 
-#: pysvnmanager/model/svnauthz.py:1511
+#: pysvnmanager/model/svnauthz.py:1527
 #, python-format
 msgid "No module exist for %s:%s"
 msgstr "模块不存在: %s:%s"
 
-#: pysvnmanager/model/svnauthz.py:1621
+#: pysvnmanager/model/svnauthz.py:1637
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr "别名 %s 为用户组 %s 引用。"
 
-#: pysvnmanager/model/svnauthz.py:1633
+#: pysvnmanager/model/svnauthz.py:1649
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr "%s 在 [%s] 中被引用。"
 
-#: pysvnmanager/model/svnauthz.py:1769
+#: pysvnmanager/model/svnauthz.py:1785
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有完全权限 (RW)"
 
-#: pysvnmanager/model/svnauthz.py:1771
+#: pysvnmanager/model/svnauthz.py:1787
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有只读权限 (RO)"
 
-#: pysvnmanager/model/svnauthz.py:1773
+#: pysvnmanager/model/svnauthz.py:1789
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s *没有* 访问权限 (XX)"
 
-#: pysvnmanager/model/svnauthz.py:1813
+#: pysvnmanager/model/svnauthz.py:1829
 #, python-format
 msgid ""
@@ -646 +645 @@
 "\n"
 
-#: pysvnmanager/model/svnauthz.py:1832
+#: pysvnmanager/model/svnauthz.py:1848
 #, python-format
 msgid ""
@@ -823 +822 @@
 
 #: pysvnmanager/templates/authz/index.mako:678
-#: pysvnmanager/templates/role/index.mako:711
+#: pysvnmanager/templates/role/index.mako:708
 msgid "Save"
 msgstr "保存"
 
 #: pysvnmanager/templates/authz/index.mako:679
-#: pysvnmanager/templates/role/index.mako:712
+#: pysvnmanager/templates/role/index.mako:709
 msgid "Delete"
 msgstr "删除"
 
 #: pysvnmanager/templates/authz/index.mako:680
-#: pysvnmanager/templates/role/index.mako:713
+#: pysvnmanager/templates/role/index.mako:710
 msgid "Cancel"
 msgstr "取消"
@@ -839 +838 @@
 #: pysvnmanager/templates/check/index.mako:5
 #: pysvnmanager/templates/check/index.mako:106
-#: pysvnmanager/templates/check/index.mako:176
+#: pysvnmanager/templates/check/index.mako:173
 msgid "Check Permissions"
 msgstr "权限检查"
@@ -871 +870 @@
 msgstr "选择用户名"
 
-#: pysvnmanager/templates/check/index.mako:139
-#: pysvnmanager/templates/check/index.mako:152
-#: pysvnmanager/templates/check/index.mako:164
+#: pysvnmanager/templates/check/index.mako:138
+#: pysvnmanager/templates/check/index.mako:149
+#: pysvnmanager/templates/check/index.mako:161
 msgid "Manual input"
 msgstr "手工输入"
 
-#: pysvnmanager/templates/check/index.mako:146
+#: pysvnmanager/templates/check/index.mako:145
 msgid "Select repository"
 msgstr "选择版本库"
 
-#: pysvnmanager/templates/check/index.mako:160
+#: pysvnmanager/templates/check/index.mako:157
 msgid "Select module"
 msgstr "选择模组"
@@ -1009 +1008 @@
 msgstr "选择一个角色:"
 
-#: pysvnmanager/templates/role/index.mako:636
+#: pysvnmanager/templates/role/index.mako:634
 msgid "New Group"
 msgstr "新用户组"
 
-#: pysvnmanager/templates/role/index.mako:637
+#: pysvnmanager/templates/role/index.mako:635
 msgid "New Alias"
 msgstr "新别名"
 
-#: pysvnmanager/templates/role/index.mako:641
+#: pysvnmanager/templates/role/index.mako:639
 msgid "New group name:"
 msgstr "新用户组名称:"
 
-#: pysvnmanager/templates/role/index.mako:645
+#: pysvnmanager/templates/role/index.mako:643
 msgid "New alias name:"
 msgstr "新别名名称:"
 
-#: pysvnmanager/templates/role/index.mako:657
+#: pysvnmanager/templates/role/index.mako:655
 msgid "Members list"
 msgstr "成员列表"
 
-#: pysvnmanager/templates/role/index.mako:662
+#: pysvnmanager/templates/role/index.mako:660
 msgid "Other users"
 msgstr "其他用户"
 
-#: pysvnmanager/templates/role/index.mako:681
+#: pysvnmanager/templates/role/index.mako:679
 msgid "Ignore recursive"
 msgstr "忽略组间循环引用"
 
-#: pysvnmanager/templates/role/index.mako:693
+#: pysvnmanager/templates/role/index.mako:691
 msgid "User name:"
 msgstr "用户名:"

trunk/pysvnmanager/lib/app_globals.py

@@ -17 +17 @@
 
 """The application's Globals object"""
-from pylons import config
 
 class Globals(object):

trunk/pysvnmanager/lib/base.py

@@ -18 +18 @@
 """The base Controller API
 
-Provides the BaseController class for subclassing, and other objects
-utilized by Controllers.
+Provides the BaseController class for subclassing.
 """
+from pylons.controllers import WSGIController
+from pylons.templating import render_mako as render
+
 from pylons import c, cache, config, g, request, response, session
-from pylons.controllers import WSGIController
 from pylons.controllers.util import abort, etag_cache, redirect_to
 from pylons.decorators import jsonify, validate
 from pylons.i18n import _, ungettext, N_
-from pylons.templating import render
 from pylons.i18n import set_lang, add_fallback
 import pysvnmanager.lib.helpers as h
@@ -92 +92 @@
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
+
         return WSGIController.__call__(self, environ, start_response)
 

trunk/pysvnmanager/lib/helpers.py

@@ -21 +21 @@
 available to Controllers. This module is available to both as 'h'.
 """
-from webhelpers import *
+# Import helpers as desired, or define your own, ie:
+# from webhelpers.html.tags import checkbox, password
+
+from routes import url_for, redirect_to
+from webhelpers.html import escape, HTML, literal, url_escape
+from webhelpers.html.tags import *
+from webhelpers.rails.prototype import link_to_remote, form_remote_tag
+from webhelpers.rails.scriptaculous import visual_effect
+from webhelpers.rails.asset_tag import javascript_include_tag, stylesheet_link_tag

trunk/pysvnmanager/model/svnauthz.py

@@ -1279 +1279 @@
                 raise Exception, "Size of file (%s) is zero!" % filename
             
-            from svn import repos as _repos
-            _repos.authz_read(filename, 1)
+            try:
+                from svn import repos as _repos
+                _repos.authz_read(filename, 1)
+            except ImportError:
+                pass
     
     def __str__(self):

trunk/pysvnmanager/templates/base.mako

@@ -32 +32 @@
       <tr>
           <td>${h.link_to(_("Check permissions"), h.url_for(controller="check", id=None))}</td>
-          <td>${h.link_to(_("Role management"), h.url(controller="role", id=None))}</td>
-          <td>${h.link_to(_("ACL management"), h.url(controller="authz", id=None))}</td>
-          <td>${h.link_to(_("Repos management"), h.url(controller="repos", id=None))}</td>
-          <td>${h.link_to(_("Change log"), h.url(controller="logs", id=None))}</td>
+          <td>${h.link_to(_("Role management"), h.url_for(controller="role", id=None))}</td>
+          <td>${h.link_to(_("ACL management"), h.url_for(controller="authz", id=None))}</td>
+          <td>${h.link_to(_("Repos management"), h.url_for(controller="repos", id=None))}</td>
+          <td>${h.link_to(_("Change log"), h.url_for(controller="logs", id=None))}</td>
           <td>welcome ${session.get('user')}</td>
-          <td>${h.link_to(_("Logout"), h.url(controller="logout", id=None))}</td>
+          <td>${h.link_to(_("Logout"), h.url_for(controller="logout", id=None))}</td>
       </tr>
   </table>

trunk/pysvnmanager/templates/check/index.mako

@@ -7 +7 @@
 
 <%
-userlist = [[_("Please choose..."), '...'], 
-            [_("All users(with anon)"), '*'], 
-            [_("Known users"), '$authenticated'], 
-            [_("Anonymous"), '$anonymous'],]
+userlist = [('...', _("Please choose...")), 
+            ('*', _("All users(with anon)")), 
+            ('$authenticated', _("Known users")), 
+            ('$anonymous', _("Anonymous")),]
 for i in c.userlist:
     if i == '*' or i =='$authenticated' or i == '$anonymous':
         continue
     if i[0] == '@':
-        userlist.append([_("Group:")+i[1:], i])
+        userlist.append((i, _("Group:")+i[1:]))
     elif i[0] == '&':
-        userlist.append([_("Alias:")+i[1:], i])
+        userlist.append((i, _("Alias:")+i[1:]))
     else:
         userlist.append([i, i])
 
-reposlist = [[_("Please choose..."), '...'], [_("All repos"), '*']]
+reposlist = [('...', _("Please choose...")), ('*', _("All repos"))]
 if '/' in c.reposlist:
-        reposlist.append([_("Default"), '/'])
+        reposlist.append(('/', _("Default")))
 for i in c.reposlist:
     if i == '/':
         continue
-    reposlist.append([i, i])
+    reposlist.append((i, i))
 
 pathlist = [[_("All modules"), '*'],]
@@ -107 +107 @@
 
 ## Classic Form
-##     ${h.form(h.url(action='permission'), method='post')}
+##     ${h.form(h.url_for(action='permission'), method='post')}
 
 ## AJAX Form
@@ -114 +114 @@
         h.form_remote_tag(
             html={'id':'main_form'}, 
-            url=h.url(action='access_map'), 
+            url=h.url_for(action='access_map'), 
             update=dict(success="acl_msg", failure="message"), 
             method='post', before='showNoticesPopup()',
@@ -133 +133 @@
         <input type="radio" name="userinput" value="select" Checked>
             ${_("Select username")}
-            <select name="userselector" size="1" onFocus="select_username(this.form)">
-                ${h.options_for_select(userlist, c.selected_username)}
-            </select><br/>
+            ${h.select("userselector", c.selected_username, userlist, onFocus="select_username(this.form)")}
+            <br/>
         <input type="radio" name="userinput" value="manual">
             ${_("Manual input")}
@@ -145 +144 @@
         <input type="radio" name="reposinput" value="select" Checked onClick="update_path(this.form)">
             ${_("Select repository")}
-            <select name="reposselector" size="0" onFocus="select_repos(this.form)" 
-                onChange="update_path(this.form)">
-                ${h.options_for_select(reposlist, c.selected_repos)}
-            </select><br/>
+            ${h.select("reposselector", c.selected_repos, reposlist, onFocus="select_repos(this.form)", onChange="update_path(this.form)")}
+            <br/>
         <input type="radio" name="reposinput" value="manual"> 
             ${_("Manual input")}

trunk/pysvnmanager/templates/repos/create.mako

@@ -13 +13 @@
         h.form_remote_tag(
             html={'id':'main_form'}, 
-            url=h.url(action='create_submit'), 
+            url=h.url_for(action='create_submit'), 
             update="message",
             method='post', before='showNoticesPopup()',

trunk/pysvnmanager/templates/repos/hooks.mako

@@ -189 +189 @@
     <select name="repos_list" size="1" onChange='repos_changed()'>
     </select>
-${h.link_to(_("Add repository"), h.url(action="create"))}
-${h.link_to(_("Remove repository"), h.url(action="remove"))}
+${h.link_to(_("Add repository"), h.url_for(action="create"))}
+${h.link_to(_("Remove repository"), h.url_for(action="remove"))}
 </DIV>
 
@@ -207 +207 @@
         h.form_remote_tag(
             html={'id':'hook_setting_form'}, 
-            url=h.url(action='setup_hook'), 
+            url=h.url_for(action='setup_hook'), 
             update="message", 
             method='post', before='showNoticesPopup()',
@@ -237 +237 @@
         h.form_remote_tag(
             html={'id':'installed_hook_form'}, 
-            url=h.url(action='uninstall_hook'), 
+            url=h.url_for(action='uninstall_hook'), 
             update="message",
             method='post', before='installed_hook_form_submit(this); showNoticesPopup()',

trunk/pysvnmanager/templates/repos/remove.mako

@@ -54 +54 @@
         h.form_remote_tag(
             html={'id':'main_form'}, 
-            url=h.url(action='remove_submit'), 
+            url=h.url_for(action='remove_submit'), 
             update="message",
             method='post', before='showNoticesPopup()',

trunk/pysvnmanager/templates/role/index.mako

@@ -10 +10 @@
 <%
 
-role_list_opts = [[_("Please choose..."), '...'],]
+role_list_opts = [('...', _("Please choose...")),]
 
 for i in c.grouplist:
@@ -16 +16 @@
         continue
     elif i[0] == '@':
-        role_list_opts.append([_("Group:")+i[1:], i])
+        role_list_opts.append((i, _("Group:")+i[1:]))
     else:
-        role_list_opts.append([i, i])
+        role_list_opts.append((i, i))
 for i in c.aliaslist:
     if i[0] == '&':
-        role_list_opts.append([_("Alias:")+i[1:], i])
+        role_list_opts.append((i, _("Alias:")+i[1:]))
     else:
-        role_list_opts.append([i, i])
-
-alias_as_list_opts = [[_("Please choose..."), '...'],]
+        role_list_opts.append((i, i))
+
+alias_as_list_opts = [('...', _("Please choose...")),]
 
 for i in c.userlist:
-    alias_as_list_opts.append([i, i])
+    alias_as_list_opts.append((i, i))
 
 all_avail_users = []
@@ -631 +631 @@
 <div id='role_list_box' style="position:relative;" class=gainlayout>
 ${_("Select a role name:")}
-    <select name="role_list" size="1" onChange='role_changed()'>
-        ${h.options_for_select(role_list_opts)}
-    </select>
+    ${h.select("role_list", "", role_list_opts, onChange='role_changed()')}
 <a href="#" onclick='new_group()'>[+${_("New Group")}]</a>
 <a href="#" onclick='new_alias()'>[+${_("New Alias")}]</a>
@@ -694 +692 @@
   </td>
   <td>
-    <select name="alias_as_list" size="1" onChange="enable_save_btn();disable_delete_btn()">
-        ${h.options_for_select(alias_as_list_opts)}
-    </select><br>
+    ${h.select("alias_as_list", "", alias_as_list_opts, onChange="enable_save_btn();disable_delete_btn()")}
+    <br>
     <input type="text" name="alias_as_input" size="10" maxlength="50" onChange="enable_save_btn();disable_delete_btn()">
   </td>

trunk/pysvnmanager/tests/__init__.py

@@ -18 +18 @@
 """Pylons application test package
 
-When the test runner finds and executes tests within this directory,
-this file will be loaded to setup the test environment.
+This package assumes the Pylons environment is already loaded, such as
+when this script is imported from the `nosetests --with-pylons=test.ini`
+command.
 
-It registers the root directory of the project in sys.path and
-pkg_resources, in case the project hasn't been installed with
-setuptools. It also initializes the application via websetup (paster
-setup-app) with the project's test.ini configuration file.
+This module initializes the application via ``websetup`` (`paster
+setup-app`) and provides the base testing objects.
 """
 import os
 import sys
 from shutil import copyfile
+from pylons import config
+
 from unittest import TestCase
 
-import pkg_resources
-import paste.fixture
-import paste.script.appinstall
 from paste.deploy import loadapp
+from paste.fixture import TestApp
+from paste.script.appinstall import SetupCommand
+from pylons import config
 from routes import url_for
 
-from pylons import config
+import pylons.test
+import pkg_resources
 
 __all__ = ['url_for', 'TestController']
@@ -50 +52 @@
 
 test_file = os.path.join(conf_dir, 'test.ini')
-cmd = paste.script.appinstall.SetupCommand('setup-app')
-cmd.run([test_file])
+
+# Invoke websetup with the current config file
+SetupCommand('setup-app').run([config['__file__']])
 
 class TestController(TestCase):
@@ -57 +60 @@
     def __init__(self, *args, **kwargs):
         self.authz_file = os.path.dirname(__file__) + '/../../config/svn.access.test'
-        wsgiapp = loadapp('config:test.ini', relative_to=conf_dir)
-        self.app = paste.fixture.TestApp(wsgiapp)
+        if pylons.test.pylonsapp:
+            wsgiapp = pylons.test.pylonsapp
+        else:
+            wsgiapp = loadapp('config:%s' % config['__file__'])
+        self.app = TestApp(wsgiapp)
         TestCase.__init__(self, *args, **kwargs)
 

trunk/pysvnmanager/tests/functional/test_authz.py

@@ -25 +25 @@
         res = self.app.get(url_for(controller='authz'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # Login as common user
@@ -31 +31 @@
         res = self.app.get(url_for(controller='authz'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security/failed', res.header('location'))
+        self.assertEqual(res.header('location'), 'http://localhost/security/failed', res.header('location'))
         
         # Login as repos admin
@@ -51 +51 @@
         res = self.app.get(url_for(controller='authz', action='init_repos_list'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -57 +57 @@
         res = self.app.get(url_for(controller='authz', action='init_repos_list'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Login as superuser
@@ -79 +79 @@
         res = self.app.get(url_for(controller='authz', action='repos_changed'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -85 +85 @@
         res = self.app.get(url_for(controller='authz', action='repos_changed'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Login as superuser
@@ -120 +120 @@
         res = self.app.get(url_for(controller='authz', action='path_changed'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -126 +126 @@
         res = self.app.get(url_for(controller='authz', action='path_changed'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         self.login('root')
@@ -166 +166 @@
             res = self.app.get(url_for(controller='authz', action='save_authz'))
             assert res.status == 302
-            self.assertEqual(res.header('location'), '/security')
+            self.assertEqual(res.header('location'), 'http://localhost/login')
 
             # authz test
@@ -172 +172 @@
             res = self.app.get(url_for(controller='authz', action='save_authz'))
             assert res.status == 302, res.status
-            assert res.header('location')== '/security/failed', res.header('location')
+            assert res.header('location')=='http://localhost/security/failed', res.header('location')
             
             # Login as superuser
@@ -334 +334 @@
         res = self.app.get(url_for(controller='authz', action='delete_authz'))
         assert res.status == 302
-        assert res.header('location')== '/security', res.header('location')
+        assert res.header('location')== 'http://localhost/login', res.header('location')
 
         # authz test
@@ -340 +340 @@
         res = self.app.get(url_for(controller='authz', action='delete_authz'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         authz = self.load_authz()

trunk/pysvnmanager/tests/functional/test_check.py

@@ -26 +26 @@
         res = self.app.get(url_for(controller='check'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # Login as common user
@@ -32 +32 @@
         res = self.app.get(url_for(controller='check'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
         
         # Login as repos admin
@@ -56 +56 @@
         res = self.app.get(url_for(controller='check', action='access_map'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -62 +62 @@
         res = self.app.get(url_for(controller='check', action='access_map'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
         
         # Login as superuser
@@ -229 +229 @@
         res = self.app.get(url_for(controller='check', action='get_auth_path'))
         assert res.status == 302
-        assert res.header('location')== '/security', res.header('location')
+        assert res.header('location')== 'http://localhost/login', res.header('location')
 
         # authz test
@@ -235 +235 @@
         res = self.app.get(url_for(controller='check', action='get_auth_path'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         self.login('root')

trunk/pysvnmanager/tests/functional/test_login.py

@@ -31 +31 @@
         res = self.app.get(url_for(controller='security', action='submit'), params)
         self.assert_(res.status == 302)
-        self.assert_(res.all_headers('location') == ['/check'])
+        self.assert_(res.all_headers('location') == ['http://localhost/'], res.all_headers('location'))
         self.assert_(res.session['user'] == 'root', res.session)
         
@@ -54 +54 @@
         res = self.app.get(url_for(controller='security', action='logout'))
         self.assert_(res.status == 302)
-        self.assert_(res.all_headers('location') == ['/security'])
+        self.assert_(res.all_headers('location') == ['http://localhost/login'], res.all_headers('location'))
         self.assert_(res.session.get('user') == None, res.session.get('user'))

trunk/pysvnmanager/tests/functional/test_repos.py

@@ -26 +26 @@
         res = self.app.get(url_for(controller='repos'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # Login as common user
@@ -32 +32 @@
         res = self.app.get(url_for(controller='repos'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
         
         # Permission denied for repos admin(not root admin)
@@ -38 +38 @@
         res = self.app.get(url_for(controller='repos'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Login as superuser

trunk/pysvnmanager/tests/functional/test_role.py

@@ -26 +26 @@
         res = self.app.get(url_for(controller='role'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # Login as common user
@@ -32 +32 @@
         res = self.app.get(url_for(controller='role'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
         
         # Permission denied for repos admin(not root admin)
@@ -38 +38 @@
         res = self.app.get(url_for(controller='role'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Login as superuser
@@ -50 +50 @@
         res = self.app.get(url_for(controller='role', action='get_role_info'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -56 +56 @@
         res = self.app.get(url_for(controller='role', action='get_role_info'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
         
         # Login as superuser
@@ -125 +125 @@
         res = self.app.get(url_for(controller='role', action='save_group'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -131 +131 @@
         res = self.app.get(url_for(controller='role', action='save_group'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Change group members, autodrop=no
@@ -209 +209 @@
         res = self.app.get(url_for(controller='role', action='delete_group'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -215 +215 @@
         res = self.app.get(url_for(controller='role', action='delete_group'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Delete group failed, ref by other group.
@@ -271 +271 @@
         res = self.app.get(url_for(controller='role', action='save_alias'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -277 +277 @@
         res = self.app.get(url_for(controller='role', action='save_alias'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Change alias successfully
@@ -348 +348 @@
         res = self.app.get(url_for(controller='role', action='delete_alias'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        self.assertEqual(res.header('location'), 'http://localhost/login')
 
         # authz test
@@ -354 +354 @@
         res = self.app.get(url_for(controller='role', action='delete_alias'))
         assert res.status == 302, res.status
-        assert res.header('location')== '/security/failed', res.header('location')
+        assert res.header('location')=='http://localhost/security/failed', res.header('location')
 
         # Delete alias successfully

trunk/pysvnmanager/tests/test_repos.py

@@ -51 +51 @@
     def testReposCreate(self):
         self.assertRaises(Exception, self.repos.create, 'repos3')
-        self.repos.delete('repos3')
-        self.repos.create('repos3')
-        self.assert_(sorted(self.repos.repos_list) == [u'project1', u'project2', u'repos3'], self.repos.repos_list)
+        try:
+            self.repos.delete('repos3')
+            self.repos.create('repos3')
+            self.assert_(sorted(self.repos.repos_list) == [u'project1', u'project2', u'repos3'], self.repos.repos_list)
+        except ImportError:
+            pass
 
     def testReposDelete(self):
-        self.assertRaises(Exception, self.repos.delete, 'project1')
+        try:
+            self.repos.delete('project1')
+        except Exception, e:
+            self.assert_(str(e) == 'Repos project1 is not a blank repository.', str(e))
     
     def testReposRoot(self):

trunk/pysvnmanager/websetup.py

@@ -30 +30 @@
 log = logging.getLogger(__name__)
 
-def setup_config(command, filename, section, vars):
+def setup_app(command, conf, vars):
     """Place any commands to setup pysvnmanager here"""
-    conf = appconfig('config:' + filename)
     load_environment(conf.global_conf, conf.local_conf)
 

trunk/setup.cfg

@@ -5 +5 @@
 [easy_install]
 find_links = http://www.pylonshq.com/download/
-
-[pudge]
-theme = pythonpaste.org
-
-# Add extra doc files here with spaces between them
-docs = docs/index.txt
-
-# Doc Settings
-doc_base = docs/
-dest = docs/html
-
-# Add extra modules here separated with commas
-modules = pysvnmanager
-title = Pysvnmanager
-organization = Pylons
-
-# Highlight code-block sections with Pygments
-highlighter = pygments
-
-# Optionally add extra links
-#organization_url = http://pylonshq.com/
-#trac_url = http://pylonshq.com/project
-settings = no_about=true
-
-# Optionally add extra settings
-#           link1=/community/ Community
-#           link2=/download/ Download
-
-[publish]
-doc-dir=docs/html
-make-dirs=1
 
 # Babel configuration

trunk/setup.py

@@ -26 +26 @@
 setup(
     name='pySvnManager',
-    version="0.2.1",
+    version="0.3.0",
     description='SVN authz web management tools.',
     author='Jiang Xin',
     author_email='jiangxin@ossxp.com',
     url='https://sourceforge.net/projects/pysvnmanager',
-    #install_requires=["Pylons>=0.9.6.2", "docutils", "python-ldap"],
-    install_requires=["Pylons>=0.9.6.2", "docutils"],
+    install_requires=[
+            "Pylons>=0.9.7rc1",
+            "docutils",
+            "Babel",
+            #"Mako>=0.2.2",
+            #"WebHelpers>=0.6.1",
+            #"Routes>=1.9.2",
+            #"python-ldap",
+    ],
+    setup_requires=["PasteScript==dev,>=1.6.3dev-r7326"],
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
@@ -41 +49 @@
             ('templates/**.mako', 'mako', None),
             ('public/**', 'ignore', None)]},
+    zip_safe = False,
+    paster_plugins=['PasteScript', 'Pylons'],
     entry_points="""
     [paste.app_factory]
@@ -48 +58 @@
     main = pylons.util:PylonsInstaller
     """,
-    zip_safe = False,
 )