kallithea Changeset - 930caa6a4e5f

Changeset - 930caa6a4e5f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 11 years ago 2015-04-17 14:58:44
thomas.de.schampheleire@gmail.com

changeset status: simplify status calculation logic

1 file changed with 5 insertions and 8 deletions:

kallithea/model/changeset_status.py

0 comments (0 inline, 0 general)

kallithea/model/changeset_status.py

➞

Show inline comments

@@ @@ -51,58 +51,55 @@ class ChangesetStatusModel(BaseModel): @@
                           with_revisions=False):
         repo = self._get_repo(repo)
         q = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == repo)
         if not with_revisions:
             q = q.filter(ChangesetStatus.version == 0)
         if revision:
             q = q.filter(ChangesetStatus.revision == revision)
         elif pull_request:
             pull_request = self.__get_pull_request(pull_request)
             q = q.filter(ChangesetStatus.pull_request == pull_request)
         else:
             raise Exception('Please specify revision or pull_request')
         q = q.order_by(ChangesetStatus.version.asc())
         return q
     def _calculate_status(self, statuses):
         """
         Given a list of statuses, calculate the resulting status, according to
         the policy: approve if consensus.
         """
         approved_votes = 0
         for st in statuses:
             if st and st.status == ChangesetStatus.STATUS_APPROVED:
                 approved_votes += 1
         if not statuses:
             return ChangesetStatus.STATUS_UNDER_REVIEW
         result = ChangesetStatus.STATUS_UNDER_REVIEW
         if approved_votes and approved_votes == len(statuses):
             result = ChangesetStatus.STATUS_APPROVED
         if all(st.status == ChangesetStatus.STATUS_APPROVED for st in statuses):
             return ChangesetStatus.STATUS_APPROVED
-        return result
+        return ChangesetStatus.STATUS_UNDER_REVIEW
     def calculate_pull_request_result(self, pull_request):
         """
         Return a tuple (reviewers, pending reviewers, pull request status)
         Only approve and reject counts as valid votes.
         """
         # collect latest votes from all voters
         cs_statuses = dict()
         for st in reversed(self.get_statuses(pull_request.org_repo,
                                              pull_request=pull_request,
                                              with_revisions=True)):
             cs_statuses[st.author.username] = st
         # collect votes from official reviewers
         pull_request_reviewers = []
         pull_request_pending_reviewers = []
         relevant_statuses = []
         for r in pull_request.reviewers:
             st = cs_statuses.get(r.user.username)
             relevant_statuses.append(st)
             if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED,
                                        ChangesetStatus.STATUS_UNDER_REVIEW):
                 st = None

0 comments (0 inline, 0 general)