Mercurial > kallithea

changeset 2178:989c137f26eb beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Notification fixes - added cs ID to notification on changeset comment - trimmed long commits to 256 chars - cast to unicode the link re ticket #418
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 01 Apr 2012 01:43:40 +0300
parents ee07357d9265
children 93f641f4b877
files rhodecode/model/comment.py
diffstat 1 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/comment.py	Sun Apr 01 01:05:15 2012 +0300
+++ b/rhodecode/model/comment.py	Sun Apr 01 01:43:40 2012 +0300
@@ -29,7 +29,7 @@
 from pylons.i18n.translation import _
 from sqlalchemy.util.compat import defaultdict
 
-from rhodecode.lib.utils2 import extract_mentioned_users
+from rhodecode.lib.utils2 import extract_mentioned_users, safe_unicode
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import ChangesetComment, User, Repository, Notification
@@ -67,7 +67,7 @@
         if text:
             repo = Repository.get(repo_id)
             cs = repo.scm_instance.get_changeset(revision)
-            desc = cs.message
+            desc = "%s - %s" % (cs.short_id, h.shorter(cs.message, 256))
             author_email = cs.author_email
             comment = ChangesetComment()
             comment.repo = repo
@@ -83,14 +83,17 @@
             line = ''
             if line_no:
                 line = _('on line %s') % line_no
-            subj = h.link_to('Re commit: %(commit_desc)s %(line)s' % \
-                                    {'commit_desc': desc, 'line': line},
-                             h.url('changeset_home', repo_name=repo.repo_name,
-                                   revision=revision,
-                                   anchor='comment-%s' % comment.comment_id,
-                                   qualified=True,
-                                   )
-                             )
+            subj = safe_unicode(
+                h.link_to('Re commit: %(commit_desc)s %(line)s' % \
+                          {'commit_desc': desc, 'line': line},
+                          h.url('changeset_home', repo_name=repo.repo_name,
+                                revision=revision,
+                                anchor='comment-%s' % comment.comment_id,
+                                qualified=True,
+                          )
+                )
+            )
+
             body = text
 
             # get the current participants of this changeset