kallithea Changeset - cc9a7766d8bd

Changeset - cc9a7766d8bd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

pull requests: notify added reviewers, just like initial reviewers are

1 file changed with 28 insertions and 30 deletions:

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -86,55 +86,57 @@ class PullRequestModel(BaseModel): @@
         new.revisions = revisions
         new.title = title
         new.description = description
         new.author = created_by_user
         Session().add(new)
         Session().flush()
         #members
         for member in set(reviewers):
             _usr = self._get_user(member)
             reviewer = PullRequestReviewers(_usr, new)
             Session().add(reviewer)
         #reset state to under-review
         ChangesetStatusModel().set_status(
             repo=org_repo,
             status=ChangesetStatus.STATUS_UNDER_REVIEW,
-            user=created_by_user,
+            user=new.author,
             pull_request=new
+        )
         self.__add_reviewers(new, reviewers)
         return new
     def __add_reviewers(self, pr, reviewers):
         #members
         for member in set(reviewers):
             _usr = self._get_user(member)
             reviewer = PullRequestReviewers(_usr, pr)
             Session().add(reviewer)
         revision_data = [(x.raw_id, x.message)
                          for x in map(org_repo.get_changeset, revisions)]
                          for x in map(pr.org_repo.get_changeset, pr.revisions)]
         #notification to reviewers
         pr_url = h.url('pullrequest_show', repo_name=other_repo.repo_name,
                        pull_request_id=new.pull_request_id,
                        qualified=True,
+        )
         pr_url = h.url('pullrequest_show', repo_name=pr.other_repo.repo_name,
                        pull_request_id=pr.pull_request_id,
                        qualified=True)
         subject = safe_unicode(
             h.link_to(
               _('%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s') % \
                 {'user': created_by_user.username,
                  'pr_title': new.title,
                  'pr_id': new.pull_request_id},
                 pr_url
                 {'user': pr.author.username,
                  'pr_title': pr.title,
                  'pr_id': pr.pull_request_id},
                 pr_url)
+            )
+        )
         body = description
         body = pr.description
         kwargs = {
             'pr_title': title,
             'pr_user_created': h.person(created_by_user.email),
             'pr_repo_url': h.url('summary_home', repo_name=other_repo.repo_name,
             'pr_title': pr.title,
             'pr_user_created': h.person(pr.author.email),
             'pr_repo_url': h.url('summary_home', repo_name=pr.other_repo.repo_name,
                                  qualified=True,),
             'pr_url': pr_url,
             'pr_revisions': revision_data
+        }
             'pr_revisions': revision_data}
-        NotificationModel().create(created_by=created_by_user, subject=subject, body=body,
+        NotificationModel().create(created_by=pr.author, subject=subject, body=body,
                                    recipients=reviewers,
                                    type_=Notification.TYPE_PULL_REQUEST, email_kwargs=kwargs)
         return new
     def update_reviewers(self, 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==
@@ @@ -143,19 +145,15 @@ class PullRequestModel(BaseModel): @@
         current_reviewers_ids = set([x.user.user_id for x in current_reviewers])
         to_add = reviewers_ids.difference(current_reviewers_ids)
         to_remove = current_reviewers_ids.difference(reviewers_ids)
         log.debug("Adding %s reviewers" % to_add)
-        log.debug("Removing %s reviewers" % to_remove)
+        self.__add_reviewers(pull_request, to_add)
         for uid in to_add:
             _usr = self._get_user(uid)
             reviewer = PullRequestReviewers(_usr, pull_request)
             Session().add(reviewer)
         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:

0 comments (0 inline, 0 general)