kallithea Changeset - 278a742731cd

Changeset - 278a742731cd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 10 years ago 2016-04-06 21:46:21
sorenl@unity3d.com

pull requests: refactor update_reviewers

This avoids a redundant database lookup for every removed reviewer,
and shows usernames (not just IDs) in associated log messages.

1 file changed with 16 insertions and 14 deletions:

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -21,24 +21,26 @@ This file was forked by the Kallithea pr @@
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Jun 6, 2012
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import datetime
 from pylons.i18n.translation import _
 from sqlalchemy.orm import joinedload
 from kallithea.model.meta import Session
 from kallithea.lib import helpers as h
 from kallithea.lib.exceptions import UserInvalidException
 from kallithea.model import BaseModel
 from kallithea.model.db import PullRequest, PullRequestReviewers, Notification, \
     ChangesetStatus, User
 from kallithea.model.notification import NotificationModel
 from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode
 log = logging.getLogger(__name__)
@@ @@ -183,41 +185,41 @@ class PullRequestModel(BaseModel): @@
     def mention_from_description(self, user, pr, old_description=''):
         mention_recipients = (extract_mentioned_users(pr.description) -
                               extract_mentioned_users(old_description))
         log.debug("Mentioning %s", mention_recipients)
         self.__add_reviewers(user, pr, set(), mention_recipients)
     def update_reviewers(self, user, pull_request, reviewers_ids):
         reviewers_ids = set(reviewers_ids)
         pull_request = self.__get_pull_request(pull_request)
         current_reviewers = PullRequestReviewers.query() \
                             .filter(PullRequestReviewers.pull_request==
                                    pull_request) \
                             .all()
         current_reviewers_ids = set([x.user.user_id for x in current_reviewers])
             .options(joinedload('user')) \
             .filter_by(pull_request=pull_request) \
             .all()
         current_reviewer_users = set(x.user for x in current_reviewers)
         new_reviewer_users = set(self._get_valid_reviewers(reviewers_ids))
         to_add = reviewers_ids.difference(current_reviewers_ids)
         to_remove = current_reviewers_ids.difference(reviewers_ids)
         to_add = new_reviewer_users - current_reviewer_users
         to_remove = current_reviewer_users - new_reviewer_users
         if not to_add and not to_remove:
             return # all done
         log.debug("Adding %s reviewers", to_add)
-        self.__add_reviewers(user, pull_request, set(self._get_valid_reviewers(to_add)), set())
         self.__add_reviewers(user, pull_request, to_add, set())
         log.debug("Removing %s reviewers", to_remove)
         for uid in to_remove:
             reviewer = PullRequestReviewers.query() \
                     .filter(PullRequestReviewers.user_id==uid,
                             PullRequestReviewers.pull_request==pull_request) \
                     .scalar()
             if reviewer:
                 Session().delete(reviewer)
         for prr in current_reviewers:
             if prr.user in to_remove:
                 Session().delete(prr)
     def delete(self, pull_request):
         pull_request = self.__get_pull_request(pull_request)
         Session().delete(pull_request)
     def close_pull_request(self, pull_request):
         pull_request = self.__get_pull_request(pull_request)
         pull_request.status = PullRequest.STATUS_CLOSED
         pull_request.updated_on = datetime.datetime.now()
         Session().add(pull_request)

0 comments (0 inline, 0 general)