kallithea Changeset - 471b29a2f302

Changeset - 471b29a2f302

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 7 years ago 2018-11-10 21:35:54
thomas.de_schampheleire@nokia.com

model: changeset_status: remove support for 'dont_allow_on_closed_pull_request' and 'StatusChangeOnClosedPullRequestError'

Previous commit removed the only usage of this parameter and exception.

2 files changed with 1 insertions and 18 deletions:

kallithea/lib/exceptions.py

kallithea/model/changeset_status.py

0 comments (0 inline, 0 general)

kallithea/lib/exceptions.py

➞

Show inline comments

@@ @@ -56,16 +56,12 @@ class UserOwnsReposException(Exception): @@
 class UserGroupsAssignedException(Exception):
     pass
 class StatusChangeOnClosedPullRequestError(Exception):
     pass
 class AttachedForksError(Exception):
     pass
 class RepoGroupAssignmentError(Exception):
     pass

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -26,13 +26,12 @@ Original author and date, and relevant c @@
 """
 import logging
 from sqlalchemy.orm import joinedload
 from kallithea.model.db import ChangesetStatus, PullRequest, Repository, User, Session
 from kallithea.lib.exceptions import StatusChangeOnClosedPullRequestError
 log = logging.getLogger(__name__)
 class ChangesetStatusModel(object):
@@ @@ -130,26 +129,23 @@ class ChangesetStatusModel(object): @@
         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, revision=None,
-                   pull_request=None, dont_allow_on_closed_pull_request=False):
                    pull_request=None):
         """
         Creates new status for changeset or updates the old ones bumping their
         version, leaving the current status at the value of 'status'.
         :param repo:
         :param status:
         :param user:
         :param comment:
         :param revision:
         :param pull_request:
         :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 = Repository.guess_instance(repo)
         q = ChangesetStatus.query()
         if revision is not None:
             assert pull_request is None
@@ @@ -162,21 +158,12 @@ class ChangesetStatusModel(object): @@
             repo = pull_request.org_repo
             q = q.filter(ChangesetStatus.repo == repo)
             q = q.filter(ChangesetStatus.revision.in_(pull_request.revisions))
             revisions = 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
             and getattr(cur_statuses[0].pull_request, 'status', '')
                 == PullRequest.STATUS_CLOSED):
             raise StatusChangeOnClosedPullRequestError(
                 'Changing status on closed pull request is not allowed'
+            )
         # update all current statuses with older version
         for st in cur_statuses:
             st.version += 1
         new_statuses = []
         for rev in revisions:

0 comments (0 inline, 0 general)