Changeset 77

Timestamp:

2009年03月08日 17时14分31秒 (3 years ago)

Author:

jiangx

Message:

Fixed #19: support hacked trac_post_commit_hook.

Location:

trunk/pysvnmanager

Files:

• hooks/plugins/TracPostCommit.py (modified) (6 diffs)
• i18n/en/LC_MESSAGES/pysvnmanager.po (modified) (7 diffs)
• i18n/pysvnmanager.pot (modified) (7 diffs)
• i18n/zh/LC_MESSAGES/pysvnmanager.po (modified) (8 diffs)

trunk/pysvnmanager/hooks/plugins/TracPostCommit.py

@@ -43 +43 @@
     key_trac_env   = "trac_env"
     key_trac_repos_name = "trac_repos_name"
+    key_trac_fixed_status = "trac_fixed_status"
     
     section = 'trac'
@@ -72 +73 @@
             result += "\n"
             result += "- " + _("Repository name in trac: ") + self.get_config(self.key_trac_repos_name) or '*default*'
+            result += "\n"
+            result += "- " + _("Fixed ticket's status: ") + self.get_config(self.key_trac_fixed_status) or '*default*'
             
         return result
@@ -109 +112 @@
         result += "<input type='text' name='trac_repos_name' size='20' value=\"%s\">" % \
                 webhelpers.util.html_escape(self.get_config(self.key_trac_repos_name))
+        result += "\n<dt>"
+        result += _("Fixed ticket status (default is closed): ")
+        result += "\n<dd>"
+        result += "<input type='text' name='trac_fixed_status' size='10' value=\"%s\">" % \
+                webhelpers.util.html_escape(self.get_config(self.key_trac_fixed_status))
         result += "\n</dl>"
         result += "</blockquote>"
@@ -121 +129 @@
         self.unset_config(self.key_trac_env)
         self.unset_config(self.key_trac_repos_name)
+        self.unset_config(self.key_trac_fixed_status)
         self.save()
     
@@ -135 +144 @@
         trac_env = params.get('trac_env')
         trac_repos_name = params.get('trac_repos_name')
+        trac_fixed_status = params.get('trac_fixed_status')
         log.debug("trac post commit setting: %s, %s" % (trac_env, trac_repos_name))
         if not trac_env:
@@ -143 +153 @@
         self.set_config(self.key_trac_env, trac_env)
         self.set_config(self.key_trac_repos_name, trac_repos_name)
+        self.set_config(self.key_trac_fixed_status, trac_fixed_status)
         self.save()
         

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

@@ -9 +9 @@
 "Project-Id-Version: pysvnmanager 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-02-24 18:06+0800\n"
+"POT-Creation-Date: 2009-03-08 16:14+0800\n"
 "PO-Revision-Date: 2008-09-27 00:48+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -317 +317 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:89
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:65
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:66
 msgid "Current configuration"
 msgstr ""
@@ -346 +346 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:113
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:91
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:91
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:93
 msgid "Fill this form"
 msgstr ""
@@ -357 +357 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:120
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:98
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
 msgid "Enable"
 msgstr ""
@@ -364 +364 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:122
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:100
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
 msgid "Disable"
 msgstr ""
@@ -490 +490 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:67
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:68
 msgid "Trac post commit hook is enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:69
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:70
 msgid "Trac post commit hook is disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:71
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:72
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:104
 msgid "Trac environment location: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:73
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:74
 msgid "Repository name in trac: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:95
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:75
+msgid "Fixed ticket's status: "
+msgstr ""
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:97
 msgid "Enable trac post commit hook: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:107
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:109
 msgid "Repository name in trac (default is blank): "
+msgstr ""
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:114
+msgid "Fixed ticket status (default is closed): "
 msgstr ""
 
@@ -552 +560 @@
 msgstr ""
 
-#: pysvnmanager/model/repos.py:166
+#: pysvnmanager/model/repos.py:187
 #, python-format
 msgid "Repos %s is not a blank repository."

trunk/pysvnmanager/i18n/pysvnmanager.pot

@@ -9 +9 @@
 "Project-Id-Version: pySvnManager 0.3.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-02-24 18:06+0800\n"
+"POT-Creation-Date: 2009-03-08 16:14+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -308 +308 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:89
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:65
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:66
 msgid "Current configuration"
 msgstr ""
@@ -337 +337 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:113
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:91
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:91
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:93
 msgid "Fill this form"
 msgstr ""
@@ -348 +348 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:120
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:98
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
 msgid "Enable"
 msgstr ""
@@ -355 +355 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:122
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:100
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
 msgid "Disable"
 msgstr ""
@@ -481 +481 @@
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:67
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:68
 msgid "Trac post commit hook is enabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:69
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:70
 msgid "Trac post commit hook is disabled."
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:71
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:72
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:104
 msgid "Trac environment location: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:73
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:74
 msgid "Repository name in trac: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:95
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:75
+msgid "Fixed ticket's status: "
+msgstr ""
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:97
 msgid "Enable trac post commit hook: "
 msgstr ""
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:107
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:109
 msgid "Repository name in trac (default is blank): "
+msgstr ""
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:114
+msgid "Fixed ticket status (default is closed): "
 msgstr ""
 
@@ -543 +551 @@
 msgstr ""
 
-#: pysvnmanager/model/repos.py:166
+#: pysvnmanager/model/repos.py:187
 #, python-format
 msgid "Repos %s is not a blank repository."

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

@@ +1 @@
+# translation of new.po to
 # translation of pysvnmanager.po to
 # Chinese (China) translations for pysvnmanager.
@@ -9 +10 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: pysvnmanager\n"
+"Project-Id-Version: new\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-02-24 18:06+0800\n"
-"PO-Revision-Date: 2009-02-24 18:14+0800\n"
+"POT-Creation-Date: 2009-03-08 16:14+0800\n"
+"PO-Revision-Date: 2009-03-08 16:17+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -341 +342 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:89
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:65
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:65
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:66
 msgid "Current configuration"
 msgstr "当前设置"
@@ -370 +371 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:113
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:91
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:91
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:93
 msgid "Fill this form"
 msgstr "填写表单"
@@ -381 +382 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:120
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:98
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:98
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
 msgid "Enable"
 msgstr "启用"
@@ -388 +389 @@
 #: pysvnmanager/hooks/plugins/EmailNotify.py:122
 #: pysvnmanager/hooks/plugins/ReadonlySvnMirror.py:100
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:100
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
 msgid "Disable"
 msgstr "关闭"
@@ -536 +537 @@
 "Integrate subversion with trac: Commit log of subversion appends to trac "
 "tickets if subversion commit log contains ticket id."
-msgstr "整合 SVN 与 trac： 如果 subversion 的提交说明包含 ticket id，则更新对应 trac 实例的 ticket 状态，将提交说明附加到 ticket 后。"
-
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:67
+msgstr ""
+"整合 SVN 与 trac： 如果 subversion 的提交说明包含 ticket id，则更新对应 trac "
+"实例的 ticket 状态，将提交说明附加到 ticket 后。"
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:68
 msgid "Trac post commit hook is enabled."
 msgstr "Trac 整合插件已经启用。"
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:69
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:70
 msgid "Trac post commit hook is disabled."
 msgstr "Trac 整合插件已经禁用。"
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:71
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:102
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:72
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:104
 msgid "Trac environment location: "
 msgstr "Trac 环境路径:"
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:73
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:74
 msgid "Repository name in trac: "
 msgstr "此版本库 trac 中的名称: "
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:95
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:75
+msgid "Fixed ticket's status: "
+msgstr "标记为修复的ticket状态: "
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:97
 msgid "Enable trac post commit hook: "
 msgstr "启用 trac 整合插件："
 
-#: pysvnmanager/hooks/plugins/TracPostCommit.py:107
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:109
 msgid "Repository name in trac (default is blank): "
 msgstr "此版本库 trac 中的名称（缺省为空）: "
+
+#: pysvnmanager/hooks/plugins/TracPostCommit.py:114
+msgid "Fixed ticket status (default is closed): "
+msgstr "标记为修复的 ticket 状态 (缺省为 closed):"
 
 #: pysvnmanager/hooks/plugins/__init__.py:111
@@ -600 +611 @@
 msgstr "版本库 %s 已经存在。"
 
-#: pysvnmanager/model/repos.py:166
+#: pysvnmanager/model/repos.py:187
 #, python-format
 msgid "Repos %s is not a blank repository."