# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-06-12 00:13:05
# Node ID 3625fd19b201cab3c509f860f148aeda1d67500c
# Parent  a7b7526c7f7c298dc1235954cd904d6f0fab1e44

pull requests: add a 'Calculated' comment on current_changeset_status

diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -442,7 +442,7 @@ class PullrequestsController(BaseRepoCon
         c.comments = cc_model.get_comments(c.rhodecode_db_repo.repo_id,
                                            pull_request=pull_request_id)
 
-        # changeset(pull-request) status calulation based on reviewers
+        # (badly named) pull-request status calculation based on reviewer votes
         c.current_changeset_status = cs_model.calculate_status(
                                         c.pull_request_reviewers,
                                          )
diff --git a/rhodecode/model/changeset_status.py b/rhodecode/model/changeset_status.py
--- a/rhodecode/model/changeset_status.py
+++ b/rhodecode/model/changeset_status.py
@@ -64,11 +64,11 @@ class ChangesetStatusModel(BaseModel):
 
     def calculate_status(self, statuses_by_reviewers):
         """
-        leading one wins, if number of occurrences are equal than weaker wins
+        approved if consensus
+        (old description: leading one wins, if number of occurrences are equal than weaker wins)
 
         :param statuses_by_reviewers:
         """
-        status = None
         votes = defaultdict(int)
         reviewers_number = len(statuses_by_reviewers)
         for user, statuses in statuses_by_reviewers:
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -37,13 +37,13 @@
           <div class="input">
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_changeset_status:
-              <div title="${_('Pull request status')}" class="changeset-status-lbl">
+              <div title="${_('Pull request status calculated from votes')}" class="changeset-status-lbl">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_changeset_status)}
               </div>
-              <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
+              <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div>
             %endif
             </div>
           </div>