The trac-post-commit-hook for svn makes for verbose comments with svnmerge

[wr0ngway@…]

I like to use the trac-post-commit-hook with svn to keep changesets associated with tickets. However, when using svnmerge, the default svnmerge comment includes all comments from the associated checkins, thereby causing duplicate, overly verbose comments to be added to all those tickets. I've found it useful to have this commit hook detect a svnmerge comment and only indicate a merge direction in the trac ticket, so I'm submitting a patch that does this. My knowledge of trac is minimal, my python really rusty, so this will probably need some work, but the concept should be sound, and it does work for me.

[wr0ngway@…]

patch to make post commit hook less verbose when using svnmerge

[Remy Blank]

Interesting.

[ebray]

Interesting… I wrote a similar patch just a couple months ago, and didn't know about this one. It's definitely worth considering. Prior to the patch, every time I did a merge, every ticket related to the merge would get updated with a very long message containing the change messages of every change that was merged. Sure it's possible to manually edit the generated commit message, but that's inconvenient.

Here's my version of the patch:

trunk/OmniPoint/Source/SVNHooks/trac-post-commit-hook

@@ -124 +124 @@
 command_re = re.compile(ticket_command)
 ticket_re = re.compile(ticket_prefix + '([0-9]+)')
+svnmerge_actions = ['Merged', 'Blocked', 'Unblocked', 'Recorded rollback of']
+svnmerge_re = re.compile(r'^\(In \[\d+\]\) (?:%s) revisions [\d,-]+ via '
+                         'svnmerge' % '|'.join(svnmerge_actions))
+svnmerge_revsplit_re = re.compile(r'(\d),(\d)')
 
 class CommitHook:
@@ -165 +169 @@
                     tickets.setdefault(tkt_id, []).append(func)
 
+        if svnmerge_re.match(self.msg):
+            self.msg = svnmerge_revsplit_re.sub(r'\1, \2',
+                                                self.msg.split('\n')[0])
+
         for tkt_id, cmds in tickets.iteritems():
             try:

The version of revsplit_re is to insert spaces into the comma-separated list of merged revisions, which can sometimes be very long, and otherwise won't wrap.

[Christian Boos]

Milestone 2.0 deleted

[Remy Blank]

svnmerge has been replaced by svn merge and svn:mergeinfo properties. AFAIK, svn merge doesn't generate a "summary" message containing all the merged changeset messages, so this issue doesn't happen anymore.