[PATCH] add optional literal word "ticket" to trac-post-commit-hook

[JoshuaFranklin]

We make good use of the trac-post-commit-hook but developers have complained that it's awkward to put just "addresses #123" instead of "addresses ticket #123". So, I edited the regex in trac-post-commit-hook to have that optional keyword—-basically just r"(?:ticket\s+?|)"—-and we're using it in our trac installation. I also changed the regex to use re.VERBOSE and commented it fully so it's easier to read.

[Herbert Valerio Riedel <hvr@…>]

I had the same problem, but rather prefered to keep the TracLinks syntax, and implemented something similiar to your patch, but with closes ticket:3628 instead of closes ticket 3628:

contrib/trac-post-commit-hook

@@ -50 +50 @@
 #   command #1 & #2 
 #   command #1 and #2
 #
+# Instead of the short-hand syntax "#1" also "ticket:1" can be used, e.g.:
+#   command ticket:1
+#   command ticket:1, ticket:2
+#   command ticket:1 & ticket:2 
+#   command ticket:1 and ticket:2
+#
 # You can have more then one command in a message. The following commands
 # are supported. There is more then one spelling for each command, to make
 # this as user-friendly as possible.
 #
-#   closes, fixes
+#   close, closed, closes, fix, fixed, fixes
 #     The specified issue numbers are closed with the contents of this
 #     commit message being added to it. 
-#   references, refs, addresses, re 
+#   references, refs, addresses, re, see 
 #     The specified issue numbers are left in their current status, but 
 #     the contents of this commit message are added to their notes. 
 #
@@ -118 +124 @@
     leftEnv = ''
     rghtEnv = ''
 
-commandPattern = re.compile(leftEnv + r'(?P<action>[A-Za-z]*).?(?P<ticket>#[0-9]+(?:(?:[, &]*|[ ]?and[ ]?)#[0-9]+)*)' + rghtEnv)
-ticketPattern = re.compile(r'#([0-9]*)')
+commandPattern = re.compile(leftEnv + r'(?P<action>[A-Za-z]*).?(?P<ticket>(?:#|ticket:)[0-9]+(?:(?:[, &]*|[ ]?and[ ]?)(?:#|ticket:)[0-9]+)*)' + rghtEnv)
+ticketPattern = re.compile(r'(?:#|ticket:)([0-9]*)')
 
 class CommitHook:
     _supported_cmds = {'close':      '_cmdClose',

[Christian Boos]

Slightly modified patch applied in r5240 (see also r5241).

[Christian Boos]

Forgot to close this one yesterday.