Files
@ 3bf057a7f7e8
Branch filter:
Location: kallithea/rhodecode/model/comment.py - annotation
3bf057a7f7e8
6.6 KiB
text/x-python
small refactoring, moved shared for diff generation of code into pull-request model
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 17caf4efe15c d2de0c2f02cd d2de0c2f02cd 89efedac4e6c d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 989c137f26eb cac5109ac3b6 d2de0c2f02cd 1bc579bcd67a 1bc579bcd67a f23828b00b21 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 54687aa00724 7d1fc253549e d2de0c2f02cd 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a cac5109ac3b6 54687aa00724 54687aa00724 cac5109ac3b6 cac5109ac3b6 54687aa00724 54687aa00724 cac5109ac3b6 7c487d2678c7 e5c0f201ca0b d2de0c2f02cd e5c0f201ca0b e5c0f201ca0b 17caf4efe15c d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7c487d2678c7 d2de0c2f02cd d2de0c2f02cd e5c0f201ca0b d2de0c2f02cd a8c9c0094ddf 7276b170ce8b cac5109ac3b6 7d1fc253549e 989c137f26eb 0e27da019f84 7276b170ce8b cac5109ac3b6 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b d2de0c2f02cd 7276b170ce8b cac5109ac3b6 f23828b00b21 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb 989c137f26eb f23828b00b21 179604334d98 179604334d98 f23828b00b21 179604334d98 0e27da019f84 0e27da019f84 7d1fc253549e 7d517a35b6c9 179604334d98 179604334d98 e5c0f201ca0b e5c0f201ca0b 179604334d98 f23828b00b21 7ff304d3028f 7ff304d3028f 7d1fc253549e 7d1fc253549e 179604334d98 179604334d98 179604334d98 f29469677319 f29469677319 179604334d98 7d1fc253549e 7276b170ce8b d2de0c2f02cd 54687aa00724 d2de0c2f02cd d2de0c2f02cd 17caf4efe15c d2de0c2f02cd d2de0c2f02cd 54687aa00724 d2de0c2f02cd 54687aa00724 d2de0c2f02cd 7c487d2678c7 1bc579bcd67a ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc 1bc579bcd67a 1bc579bcd67a ad19dfcdb1cc 1bc579bcd67a ad19dfcdb1cc 7c487d2678c7 7c487d2678c7 ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a ad19dfcdb1cc 1bc579bcd67a ad19dfcdb1cc 7c487d2678c7 1bc579bcd67a ad19dfcdb1cc 7c487d2678c7 1bf03daafaf0 b61e540122f2 b61e540122f2 ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc 1bc579bcd67a 1bc579bcd67a 1bc579bcd67a ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc ad19dfcdb1cc 7276b170ce8b 17caf4efe15c 7c487d2678c7 7c487d2678c7 7276b170ce8b 7276b170ce8b | # -*- coding: utf-8 -*-
"""
rhodecode.model.comment
~~~~~~~~~~~~~~~~~~~~~~~
comments model for RhodeCode
:created_on: Nov 11, 2011
:author: marcink
:copyright: (C) 2011-2012 Marcin Kuzminski <marcin@python-works.com>
:license: GPLv3, see COPYING for more details.
"""
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import logging
import traceback
from pylons.i18n.translation import _
from sqlalchemy.util.compat import defaultdict
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, PullRequest
from rhodecode.model.notification import NotificationModel
log = logging.getLogger(__name__)
class ChangesetCommentsModel(BaseModel):
def __get_changeset_comment(self, changeset_comment):
return self._get_instance(ChangesetComment, changeset_comment)
def __get_pull_request(self, pull_request):
return self._get_instance(PullRequest, pull_request)
def _extract_mentions(self, s):
user_objects = []
for username in extract_mentioned_users(s):
user_obj = User.get_by_username(username, case_insensitive=True)
if user_obj:
user_objects.append(user_obj)
return user_objects
def create(self, text, repo_id, user_id, revision, f_path=None,
line_no=None, status_change=None):
"""
Creates new comment for changeset. IF status_change is not none
this comment is associated with a status change of changeset
:param text:
:param repo_id:
:param user_id:
:param revision:
:param f_path:
:param line_no:
:param status_change:
"""
if text:
repo = Repository.get(repo_id)
cs = repo.scm_instance.get_changeset(revision)
desc = "%s - %s" % (cs.short_id, h.shorter(cs.message, 256))
author_email = cs.author_email
comment = ChangesetComment()
comment.repo = repo
comment.user_id = user_id
comment.revision = revision
comment.text = text
comment.f_path = f_path
comment.line_no = line_no
self.sa.add(comment)
self.sa.flush()
# make notification
line = ''
if line_no:
line = _('on line %s') % line_no
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
recipients = ChangesetComment.get_users(revision=revision)
# add changeset author if it's in rhodecode system
recipients += [User.get_by_email(author_email)]
# create notification objects, and emails
NotificationModel().create(
created_by=user_id, subject=subj, body=body,
recipients=recipients, type_=Notification.TYPE_CHANGESET_COMMENT,
email_kwargs={'status_change': status_change}
)
mention_recipients = set(self._extract_mentions(body))\
.difference(recipients)
if mention_recipients:
subj = _('[Mention]') + ' ' + subj
NotificationModel().create(
created_by=user_id, subject=subj, body=body,
recipients=mention_recipients,
type_=Notification.TYPE_CHANGESET_COMMENT,
email_kwargs={'status_change': status_change}
)
return comment
def delete(self, comment):
"""
Deletes given comment
:param comment_id:
"""
comment = self.__get_changeset_comment(comment)
self.sa.delete(comment)
return comment
def get_comments(self, repo_id, revision=None, pull_request=None):
"""
Get's main comments based on revision or pull_request_id
:param repo_id:
:type repo_id:
:param revision:
:type revision:
:param pull_request:
:type pull_request:
"""
q = ChangesetComment.query()\
.filter(ChangesetComment.repo_id == repo_id)\
.filter(ChangesetComment.line_no == None)\
.filter(ChangesetComment.f_path == None)
if revision:
q = q.filter(ChangesetComment.revision == revision)
elif pull_request:
pull_request = self.__get_pull_request(pull_request)
q = q.filter(ChangesetComment.pull_request == pull_request)
else:
raise Exception('Please specify revision or pull_request')
return q.all()
def get_inline_comments(self, repo_id, revision=None, pull_request=None):
q = self.sa.query(ChangesetComment)\
.filter(ChangesetComment.repo_id == repo_id)\
.filter(ChangesetComment.line_no != None)\
.filter(ChangesetComment.f_path != None)\
.order_by(ChangesetComment.comment_id.asc())\
if revision:
q = q.filter(ChangesetComment.revision == revision)
elif pull_request:
pull_request = self.__get_pull_request(pull_request)
q = q.filter(ChangesetComment.pull_request == pull_request)
else:
raise Exception('Please specify revision or pull_request_id')
comments = q.all()
paths = defaultdict(lambda: defaultdict(list))
for co in comments:
paths[co.f_path][co.line_no].append(co)
return paths.items()
|