Changeset - cfd9115db2a5
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com
pull requests: cleanup of PR status voting calculation
3 files changed with 45 insertions and 47 deletions:
kallithea/controllers/pullrequests.py
4
22
kallithea/model/changeset_status.py
31
17
kallithea/templates/pullrequests/pullrequest_show.html
10
8
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -474,70 +474,52 @@ class PullrequestsController(BaseRepoCon
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def show(self, repo_name, pull_request_id):

			




	
	
	
		
 
        repo_model = RepoModel()

			




	
	
	
		
 
        c.users_array = repo_model.get_users_js()

			




	
	
	
		
 
        c.user_groups_array = repo_model.get_user_groups_js()

			




	
	
	
		
 
        c.pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request)

			




	
	
	
		
 
        cc_model = ChangesetCommentsModel()

			




	
	
	
		
 
        cs_model = ChangesetStatusModel()

			




	
	
	
		
 
        _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo,

			




	
	
	
		
 
                                            pull_request=c.pull_request,

			




	
	
	
		
 
                                            with_revisions=True)

			




	
	
	
		
 

			




	
	
	
		
 
        cs_statuses = defaultdict(list)

			




	
	
	
		
 
        for st in _cs_statuses:

			




	
	
	
		
 
            cs_statuses[st.author.username] += [st]

			




	
	
	
		
 

			




	
	
	
		
 
        c.pull_request_reviewers = []

			




	
	
	
		
 
        c.pull_request_pending_reviewers = []

			




	
	
	
		
 
        for o in c.pull_request.reviewers:

			




	
	
	
		
 
            st = cs_statuses.get(o.user.username, None)

			




	
	
	
		
 
            if st:

			




	
	
	
		
 
                sorter = lambda k: k.version

			




	
	
	
		
 
                st = [(x, list(y)[0])

			




	
	
	
		
 
                      for x, y in (groupby(sorted(st, key=sorter), sorter))]

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.pull_request_pending_reviewers.append(o.user)

			




	
	
	
		
 
            c.pull_request_reviewers.append([o.user, st])

			




	
	
	
		
 

			




	
	
	
		
 
        # pull_requests repo_name we opened it against

			




	
	
	
		
 
        # ie. other_repo must match

			




	
	
	
		
 
        if repo_name != c.pull_request.other_repo.repo_name:

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
        # load compare data into template context

			




	
	
	
		
 
        enable_comments = not c.pull_request.is_closed()

			




	
	
	
		
 
        self._load_compare_data(c.pull_request, enable_comments=enable_comments)

			




	
	
	
		
 

			




	
	
	
		
 
        # inline comments

			




	
	
	
		
 
        c.inline_cnt = 0

			




	
	
	
		
 
        c.inline_comments = cc_model.get_inline_comments(

			




	
	
	
		
 
                                c.db_repo.repo_id,

			




	
	
	
		
 
                                pull_request=pull_request_id)

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 
        # comments

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id,

			




	
	
	
		
 
                                           pull_request=pull_request_id)

			




	
	
	
		
 

			




	
	
	
		
 
        # (badly named) pull-request status calculation based on reviewer votes

			




	
	
	
		
 
        c.current_changeset_status = cs_model.calculate_status(

			




	
	
	
		
 
                                        c.pull_request_reviewers,

			




	
	
	
		
 
                                         )

			




	
	
	
		
 
        (c.pull_request_reviewers,

			




	
	
	
		
 
         c.pull_request_pending_reviewers,

			




	
	
	
		
 
         c.current_voting_result,

			




	
	
	
		
 
         ) = cs_model.calculate_pull_request_result(c.pull_request)

			




	
	
	
		
 
        c.changeset_statuses = ChangesetStatus.STATUSES

			




	
	
	
		
 

			




	
	
	
		
 
        c.as_form = False

			




	
	
	
		
 
        c.ancestor = None # there is one - but right here we don't know which

			




	
	
	
		
 
        return render('/pullrequests/pullrequest_show.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def comment(self, repo_name, pull_request_id):

			




        

    


    
    

    

        

                

                    kallithea/model/changeset_status.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -56,44 +56,57 @@ class ChangesetStatusModel(BaseModel):

			




	
	
	
		
 
            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_by_reviewers):

			




	
	
	
		
 
    def calculate_pull_request_result(self, pull_request):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        approved if consensus

			




	
	
	
		
 
        (old description: leading one wins, if number of occurrences are equal than weaker wins)

			




	
	
	
		
 

			




	
	
	
		
 
        :param statuses_by_reviewers:

			




	
	
	
		
 
        Policy: approve if consensus. Only approve and reject counts as valid votes.

			




	
	
	
		
 
        """

			




	
	
	
		
 
        votes = defaultdict(int)

			




	
	
	
		
 
        reviewers_number = len(statuses_by_reviewers)

			




	
	
	
		
 
        for user, statuses in statuses_by_reviewers:

			




	
	
	
		
 
            if statuses:

			




	
	
	
		
 
                ver, latest = statuses[0]

			




	
	
	
		
 
                votes[latest.status] += 1

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                votes[ChangesetStatus.DEFAULT] += 1

			




	
	
	
		
 

			




	
	
	
		
 
        if votes.get(ChangesetStatus.STATUS_APPROVED) == reviewers_number:

			




	
	
	
		
 
            return ChangesetStatus.STATUS_APPROVED

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return ChangesetStatus.STATUS_UNDER_REVIEW

			




	
	
	
		
 
        # 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 = []

			




	
	
	
		
 
        approved_votes = 0

			




	
	
	
		
 
        for r in pull_request.reviewers:

			




	
	
	
		
 
            st = cs_statuses.get(r.user.username)

			




	
	
	
		
 
            if st and st.status == ChangesetStatus.STATUS_APPROVED:

			




	
	
	
		
 
                approved_votes += 1

			




	
	
	
		
 
            if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED,

			




	
	
	
		
 
                                       ChangesetStatus.STATUS_UNDER_REVIEW):

			




	
	
	
		
 
                st = None

			




	
	
	
		
 
                pull_request_pending_reviewers.append(r.user)

			




	
	
	
		
 
            pull_request_reviewers.append((r.user, st))

			




	
	
	
		
 

			




	
	
	
		
 
        # calculate result

			




	
	
	
		
 
        result = ChangesetStatus.STATUS_UNDER_REVIEW

			




	
	
	
		
 
        if approved_votes and approved_votes == len(pull_request.reviewers):

			




	
	
	
		
 
            result = ChangesetStatus.STATUS_APPROVED

			




	
	
	
		
 

			




	
	
	
		
 
        return (pull_request_reviewers,

			




	
	
	
		
 
                pull_request_pending_reviewers,

			




	
	
	
		
 
                result)

			




	
	
	
		
 

			




	
	
	
		
 
    def get_statuses(self, repo, revision=None, pull_request=None,

			




	
	
	
		
 
                     with_revisions=False):

			




	
	
	
		
 
        q = self._get_status_query(repo, revision, pull_request,

			




	
	
	
		
 
                                   with_revisions)

			




	
	
	
		
 
        return q.all()

			




	
	
	
		
 

			




	
	
	
		
 
    def get_status(self, repo, revision=None, pull_request=None, as_str=True):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns latest status of changeset for given revision or for given

			




	
	
	
		
 
        pull request. Statuses are versioned inside a table itself and

			




	
	
	
		
 
        version == 0 is always the current one

			




	
	
		
 
@@ -147,24 +160,25 @@ class ChangesetStatusModel(BaseModel):

			




	
	
	
		
 
            raise StatusChangeOnClosedPullRequestError(

			




	
	
	
		
 
                'Changing status on closed pull request is not allowed'

			




	
	
	
		
 
            )

			




	
	
	
		
 

			




	
	
	
		
 
        #update all current statuses with older version

			




	
	
	
		
 
        if cur_statuses:

			




	
	
	
		
 
            for st in cur_statuses:

			




	
	
	
		
 
                st.version += 1

			




	
	
	
		
 
                self.sa.add(st)

			




	
	
	
		
 

			




	
	
	
		
 
        def _create_status(user, repo, status, comment, revision, pull_request):

			




	
	
	
		
 
            new_status = ChangesetStatus()

			




	
	
	
		
 
            new_status.version = 0 # default

			




	
	
	
		
 
            new_status.author = self._get_user(user)

			




	
	
	
		
 
            new_status.repo = self._get_repo(repo)

			




	
	
	
		
 
            new_status.status = status

			




	
	
	
		
 
            new_status.comment = comment

			




	
	
	
		
 
            new_status.revision = revision

			




	
	
	
		
 
            new_status.pull_request = pull_request

			




	
	
	
		
 
            return new_status

			




	
	
	
		
 

			




	
	
	
		
 
        if revision:

			




	
	
	
		
 
            new_status = _create_status(user=user, repo=repo, status=status,

			




	
	
	
		
 
                           comment=comment, revision=revision,

			




	
	
	
		
 
                           pull_request=None)

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -69,51 +69,53 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              <div class="buttons">

			




	
	
	
		
 
                  ${h.submit('save',_('Save'),class_="btn btn-mini")}

			




	
	
	
		
 
                  ${h.reset('reset',_('Cancel'),class_="btn btn-mini",onclick="YUD.setStyle('pr-edit-form','display','none');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','')")}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          ${h.end_form()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Review status')}:</label>

			




	
	
	
		
 
              <label>${_('Reviewer voting result')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="changeset-status-container" style="float:none;clear:both">

			




	
	
	
		
 
            %if c.current_changeset_status:

			




	
	
	
		
 
            %if c.current_voting_result:

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:0px 4px 0px 0px">

			




	
	
	
		
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div>

			




	
	
	
		
 
                  <img src="${h.url('/images/icons/flag_status_%s.png' % c.current_voting_result)}" title="${_('Pull request status calculated from votes')}"/></div>

			




	
	
	
		
 
              <div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">

			




	
	
	
		
 
                %if c.pull_request.is_closed():

			




	
	
	
		
 
                    ${_('Closed')},

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_changeset_status)}

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_voting_result)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Still not reviewed by')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            % if len(c.pull_request_pending_reviewers) > 0:

			




	
	
	
		
 
                <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>

			




	
	
	
		
 
            % elif len(c.pull_request_reviewers) > 0:

			




	
	
	
		
 
                <div>${_('Pull request was reviewed by all reviewers')}</div>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
                <div>${_('Pull request was reviewed by all reviewers')}</div>

			




	
	
	
		
 
                <div>${_('There are no reviewers')}</div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Origin repository')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
              <span><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>

			




	
	
	
		
 

			




	
	
	
		
 
              ## branch link is only valid if it is a branch

			




	
	
		
 
@@ -173,26 +175,26 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
       <div class="pr-details-title">${_('Pull request reviewers')}</div>

			




	
	
	
		
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <ul id="review_members" class="group_members">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <li id="reviewer_${member.user_id}">

			




	
	
	
		
 
                <div class="reviewers_member">

			




	
	
	
		
 
                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">

			




	
	
	
		
 
                      <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>

			




	
	
	
		
 
                    <div class="reviewer_status tooltip" title="${h.tooltip(h.changeset_status_lbl(status.status if status else 'not_reviewed'))}">

			




	
	
	
		
 
                      <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status.status if status else 'not_reviewed')))}"/>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  <div class="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

			




	
	
	
		
 
                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

			




	
	
	
		
 
                  <input type="hidden" value="${member.user_id}" name="review_members" />

			




	
	
	
		
 
                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




	
	
	
		
 
                      <i class="icon-remove-sign" style="color: #FF4444;"></i>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </li>

			




	
	
	
		
 
            %endfor

			




	
	
		
 
@@ -284,25 +286,25 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    % if not c.pull_request.is_closed():

			




	
	
	
		
 
      ## main comment form and it status

			




	
	
	
		
 
      ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                                pull_request_id=c.pull_request.pull_request_id),

			




	
	
	
		
 
                         c.current_changeset_status,

			




	
	
	
		
 
                         c.current_voting_result,

			




	
	
	
		
 
                         is_pr=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.