From a501719673aebe5c8a4c2f5336c97a40cd73147e Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 1 Oct 2013 00:14:24 +0000 Subject: [PATCH] ICU-9950 improve review tool X-SVN-Rev: 34499 --- .../IcuCodeTools/0.12/icucodetools/review.py | 16 ++++++++++++++-- .../0.12/icucodetools/templates/review.html | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/trac/IcuCodeTools/0.12/icucodetools/review.py b/tools/trac/IcuCodeTools/0.12/icucodetools/review.py index 93d59ade0e7..a310921ea95 100755 --- a/tools/trac/IcuCodeTools/0.12/icucodetools/review.py +++ b/tools/trac/IcuCodeTools/0.12/icucodetools/review.py @@ -1,10 +1,12 @@ -# Copyright (C) 2007-2012 International Business Machines Corporation and Others. All Rights Reserved. +# Copyright (C) 2007-2013 International Business Machines Corporation and Others. All Rights Reserved. # Review module. # TODO: refactor ticket manipulation items into ticketmgr. import re +import traceback + from trac.core import Component, implements from trac.core import ComponentManager from trac.core import TracError @@ -13,7 +15,8 @@ from trac.web import IRequestHandler from trac.web.chrome import add_stylesheet, add_script, ITemplateProvider, add_ctxtnav from trac.versioncontrol import Changeset from trac.web.api import IRequestFilter -from trac.wiki import wiki_to_html, wiki_to_oneliner, IWikiSyntaxProvider +from trac.wiki import wiki_to_html, format_to_oneliner, IWikiSyntaxProvider +from trac.mimeview import Context from genshi.builder import tag #from trac.env import IEnvironmentSetupParticipant @@ -180,6 +183,7 @@ class ReviewModule(Component): #ticketlist = {} # dict of ticket->??? #revlist = {} # dict of revision-> repos = self.env.get_repository() + context = Context.from_request(req, False) new_path = req.args.get('new_path') new_rev = req.args.get('new') @@ -243,6 +247,14 @@ class ReviewModule(Component): revision['author'] = chgset.author revision['num'] = rev revision['comment'] = message #wiki_to_oneliner( message, self.env, db, shorten=False ) + try: + revision['comment_wiki'] = format_to_oneliner( self.env, context, message, shorten=False ) + except Exception, e: + self.env.log.warn(e) + revision['comment_wiki'] = "%s (could not format - %s)" % (message, str(e)) + #return system_message(_('HTML parsing error: %(message)s', + # message=escape(e.msg)), line) + rbranches = revision['branches'] = [] for chg in chgset.get_changes(): path = chg[0] diff --git a/tools/trac/IcuCodeTools/0.12/icucodetools/templates/review.html b/tools/trac/IcuCodeTools/0.12/icucodetools/templates/review.html index 696464bf7bd..35917a9ed09 100644 --- a/tools/trac/IcuCodeTools/0.12/icucodetools/templates/review.html +++ b/tools/trac/IcuCodeTools/0.12/icucodetools/templates/review.html @@ -2,7 +2,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - ${rev.comment} + ${rev.comment_wiki}