kallithea Changeset - f54dca244402

Changeset - f54dca244402

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

changeset: refactor set_status so a comment always must be specified

2 files changed with 12 insertions and 12 deletions:

kallithea/model/changeset_status.py

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -103,51 +103,42 @@ class ChangesetStatusModel(BaseModel): @@
         :param pull_request: pull_request reference
         :param as_str: return status as string not object
         """
         q = self._get_status_query(repo, revision, pull_request)
         # need to use first here since there can be multiple statuses
         # returned from pull_request
         status = q.first()
         if as_str:
             return str(status.status) if status else ChangesetStatus.DEFAULT
         return status
-    def set_status(self, repo, status, user, comment=None, revision=None,
     def set_status(self, repo, status, user, comment, revision=None,
                    pull_request=None, dont_allow_on_closed_pull_request=False):
         """
         Creates new status for changeset or updates the old ones bumping their
         version, leaving the current status at
         :param repo:
         :param revision:
         :param status:
         :param user:
         :param comment:
         :param dont_allow_on_closed_pull_request: don't allow a status change
             if last status was for pull request and it's closed. We shouldn't
             mess around this manually
         """
         repo = self._get_repo(repo)
         q = ChangesetStatus.query()
         if not comment:
             from kallithea.model.comment import ChangesetCommentsModel
             comment = ChangesetCommentsModel().create(
                 text=u'Auto status change to %s' % (ChangesetStatus.get_status_lbl(status)),
                 repo=repo,
                 user=user,
                 pull_request=pull_request,
                 send_email=False
+            )
         if revision:
             q = q.filter(ChangesetStatus.repo == repo)
             q = q.filter(ChangesetStatus.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetStatus.repo == pull_request.org_repo)
             q = q.filter(ChangesetStatus.revision.in_(pull_request.revisions))
         cur_statuses = q.all()
         #if statuses exists and last is associated with a closed pull request
         # we need to check if we can allow this status change
         if (dont_allow_on_closed_pull_request and cur_statuses

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -82,28 +82,37 @@ class PullRequestModel(BaseModel): @@
         new.org_repo = org_repo
         new.org_ref = org_ref
         new.other_repo = other_repo
         new.other_ref = other_ref
         new.revisions = revisions
         new.title = title
         new.description = description
         new.author = created_by_user
         Session().add(new)
         Session().flush()
         #reset state to under-review
         ChangesetStatusModel().set_status(
         from kallithea.model.comment import ChangesetCommentsModel
         comment = ChangesetCommentsModel().create(
             text=u'Auto status change to %s' % (ChangesetStatus.get_status_lbl(ChangesetStatus.STATUS_UNDER_REVIEW)),
             repo=org_repo,
             status=ChangesetStatus.STATUS_UNDER_REVIEW,
             user=new.author,
             pull_request=new,
             send_email=False
+        )
         ChangesetStatusModel().set_status(
             org_repo,
             ChangesetStatus.STATUS_UNDER_REVIEW,
             new.author,
             comment,
             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)

0 comments (0 inline, 0 general)