Ticket #1310: trac-post-commit-hook.0.10-stable.2.diff

trac-post-commit-hook

@@ -32 +32 @@
 #
 # REPOS="$1"
 # REV="$2"
-# LOG=`/usr/bin/svnlook log -r $REV $REPOS`
-# AUTHOR=`/usr/bin/svnlook author -r $REV $REPOS`
 # TRAC_ENV='/somewhere/trac/project/'
 # TRAC_URL='http://trac.mysite.com/project/'
 #
 # /usr/bin/python /usr/local/src/trac/contrib/trac-post-commit-hook \
 #  -p "$TRAC_ENV"  \
 #  -r "$REV"       \
-#  -u "$AUTHOR"    \
-#  -m "$LOG"       \
 #  -s "$TRAC_URL"
 #
 # It searches commit messages for text in the form of:
@@ -80 +76 @@
 # TODO: move grouped_changelog_entries to model.py
 from trac.util.text import to_unicode
 from trac.web.href import Href
+from trac.versioncontrol.svn_fs import SubversionRepository, SubversionChangeset
 
 try:
     from optparse import OptionParser
@@ -137 +134 @@
     def __init__(self, project=options.project, author=options.user,
                  rev=options.rev, msg=options.msg, url=options.url,
                  encoding=options.encoding):
+        self.env = open_environment(project)
+        repos_dir = self.env.config.get('trac', 'repository_dir')
+        self.env.get_repository() # will do a `sync` if needed
+        repos = SubversionRepository(repos_dir, '', '')
+        change = repos.get_changeset(rev)
+        msg = change.message
         msg = to_unicode(msg, encoding)
-        self.author = author
+        self.author = change.author
         self.rev = rev
         self.msg = "(In [%s]) %s" % (rev, msg)
         self.now = int(time.time()) 
-        self.env = open_environment(project)
-        self.env.get_repository() # will do a `sync` if needed
         if url is None:
             url = self.env.config.get('project', 'url')
         self.env.href = Href(url)
@@ -195 +196 @@
 
 
 if __name__ == "__main__":
-    if len(sys.argv) < 5:
+    if len(sys.argv) < 3:
         print "For usage: %s --help" % (sys.argv[0])
     else:
         CommitHook()