Changeset - f285faa3a602
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Mads Kiilerich - 13 years ago 2013-02-04 22:19:32
madski@unity3d.com
pull request: move code around and rename default variables
2 files changed with 15 insertions and 16 deletions:
rhodecode/controllers/pullrequests.py
14
15
rhodecode/templates/pullrequests/pullrequest.html
1
1
0 comments (0 inline, 0 general)
rhodecode/controllers/pullrequests.py
➞
Show inline comments
 
@@ -103,85 +103,84 @@ class PullrequestsController(BaseRepoCon
 
        return (self.rhodecode_user.admin or owner or reviewer)
 

			




	
	
	
		
 
    def show_all(self, repo_name):

			




	
	
	
		
 
        c.pull_requests = PullRequestModel().get_all(repo_name)

			




	
	
	
		
 
        c.repo_name = repo_name

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def index(self):

			




	
	
	
		
 
        org_repo = c.rhodecode_db_repo

			




	
	
	
		
 

			




	
	
	
		
 
        if org_repo.scm_instance.alias != 'hg':

			




	
	
	
		
 
            log.error('Review not available for GIT REPOS')

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            org_repo.scm_instance.get_changeset()

			




	
	
	
		
 
        except EmptyRepositoryError, e:

			




	
	
	
		
 
            h.flash(h.literal(_('There are no changesets yet')),

			




	
	
	
		
 
                    category='warning')

			




	
	
	
		
 
            redirect(url('summary_home', repo_name=org_repo.repo_name))

			




	
	
	
		
 

			




	
	
	
		
 
        other_repos_info = {}

			




	
	
	
		
 

			




	
	
	
		
 
        c.org_refs = self._get_repo_refs(c.rhodecode_repo)

			




	
	
	
		
 
        c.org_repos = []

			




	
	
	
		
 
        c.other_repos = []

			




	
	
	
		
 
        c.org_repos.append((org_repo.repo_name, '%s/%s' % (

			




	
	
	
		
 
                                org_repo.user.username, c.repo_name))

			




	
	
	
		
 
                           )

			




	
	
	
		
 

			




	
	
	
		
 
        # add org repo to other so we can open pull request agains itself

			




	
	
	
		
 
        c.other_repos.extend(c.org_repos)

			




	
	
	
		
 
        c.org_refs = self._get_repo_refs(c.rhodecode_repo)

			




	
	
	
		
 

			




	
	
	
		
 
        c.default_pull_request = org_repo.repo_name  # repo name pre-selected

			




	
	
	
		
 
        c.default_pull_request_rev = self._get_default_rev(org_repo)  # revision pre-selected

			




	
	
	
		
 
        c.default_revs = self._get_repo_refs(org_repo.scm_instance)

			




	
	
	
		
 
        #add orginal repo

			




	
	
	
		
 
        c.other_repos = []

			




	
	
	
		
 
        # add org repo to other so we can open pull request against itself

			




	
	
	
		
 
        c.other_repos.extend(c.org_repos)

			




	
	
	
		
 
        c.default_other_repo = org_repo.repo_name

			




	
	
	
		
 
        c.default_other_refs = self._get_repo_refs(org_repo.scm_instance)

			




	
	
	
		
 
        c.default_other_ref = self._get_default_rev(org_repo)

			




	
	
	
		
 
        other_repos_info[org_repo.repo_name] = {

			




	
	
	
		
 
            'gravatar': h.gravatar_url(org_repo.user.email, 24),

			




	
	
	
		
 
            'description': org_repo.description,

			




	
	
	
		
 
            'revs': h.select('other_ref', '', c.default_revs, class_='refs')

			




	
	
	
		
 
            'revs': h.select('other_ref', '', c.default_other_refs, class_='refs')

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        #gather forks and add to this list

			




	
	
	
		
 
        # gather forks and add to this list ... even though it is rare to request forks to pull their parent

			




	
	
	
		
 
        for fork in org_repo.forks:

			




	
	
	
		
 
            c.other_repos.append((fork.repo_name, '%s/%s' % (

			




	
	
	
		
 
                                    fork.user.username, fork.repo_name))

			




	
	
	
		
 
                                 )

			




	
	
	
		
 
            other_repos_info[fork.repo_name] = {

			




	
	
	
		
 
                'gravatar': h.gravatar_url(fork.user.email, 24),

			




	
	
	
		
 
                'description': fork.description,

			




	
	
	
		
 
                'revs': h.select('other_ref', '',

			




	
	
	
		
 
                                 self._get_repo_refs(fork.scm_instance),

			




	
	
	
		
 
                                 class_='refs')

			




	
	
	
		
 
            }

			




	
	
	
		
 
        #add parents of this fork also, but only if it's not empty

			




	
	
	
		
 

			




	
	
	
		
 
        # add parents of this fork also, but only if it's not empty

			




	
	
	
		
 
        if org_repo.parent and org_repo.parent.scm_instance.revisions:

			




	
	
	
		
 
            c.default_pull_request = org_repo.parent.repo_name

			




	
	
	
		
 
            c.default_pull_request_rev = self._get_default_rev(org_repo.parent)

			




	
	
	
		
 
            c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)

			




	
	
	
		
 
            c.default_other_repo = org_repo.parent.repo_name

			




	
	
	
		
 
            c.default_other_refs = self._get_repo_refs(org_repo.parent.scm_instance)

			




	
	
	
		
 
            c.default_other_ref = self._get_default_rev(org_repo.parent)

			




	
	
	
		
 
            c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (

			




	
	
	
		
 
                                        org_repo.parent.user.username,

			




	
	
	
		
 
                                        org_repo.parent.repo_name))

			




	
	
	
		
 
                                     )

			




	
	
	
		
 
            other_repos_info[org_repo.parent.repo_name] = {

			




	
	
	
		
 
                'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),

			




	
	
	
		
 
                'description': org_repo.parent.description,

			




	
	
	
		
 
                'revs': h.select('other_ref', '',

			




	
	
	
		
 
                                 self._get_repo_refs(org_repo.parent.scm_instance),

			




	
	
	
		
 
                                 class_='refs')

			




	
	
	
		
 
            }

			




	
	
	
		
 

			




	
	
	
		
 
        c.other_repos_info = json.dumps(other_repos_info)

			




	
	
	
		
 
        c.review_members = [org_repo.user]

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    @NotAnonymous()

			




	
	
	
		
 
    def create(self, repo_name):

			




	
	
	
		
 
        repo = RepoModel()._get_repo(repo_name)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            _form = PullRequestForm(repo.repo_id)().to_python(request.POST)

			




	
	
	
		
 
        except formencode.Invalid, errors:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            if errors.error_dict.get('revisions'):

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -27,49 +27,49 @@

			




	
	
	
		
 
        ##ORG

			




	
	
	
		
 
        <div style="float:left">

			




	
	
	
		
 
            <div class="fork_user">

			




	
	
	
		
 
                <div class="gravatar">

			




	
	
	
		
 
                    <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_db_repo.user.email,24)}"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="font-size: 20px">

			




	
	
	
		
 
                ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref','',c.org_refs,class_='refs')}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                 <div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
          <div style="float:left;font-size:24px;padding:0px 20px">

			




	
	
	
		
 
          <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ##OTHER, most Probably the PARENT OF THIS FORK

			




	
	
	
		
 
        <div style="float:left">

			




	
	
	
		
 
            <div class="fork_user">

			




	
	
	
		
 
                <div class="gravatar">

			




	
	
	
		
 
                    <img id="other_repo_gravatar" alt="gravatar" src=""/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="font-size: 20px">

			




	
	
	
		
 
                ${h.select('other_repo',c.default_pull_request,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_pull_request_rev,c.default_revs,class_='refs')}

			




	
	
	
		
 
                ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                 <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
       ## overview pulled by ajax

			




	
	
	
		
 
       <div style="float:left" id="pull_request_overview"></div>

			




	
	
	
		
 
       <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">

			




	
	
	
		
 
            <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
     </div>

			




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

			




	
	
	
		
 
        <h4>${_('Pull request reviewers')}</h4>

			




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

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div class="group_members_wrap">

			




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

			




	
	
	
		
 
            %for member in c.review_members:

			




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

			




	
	
	
		
 
                <div class="reviewers_member">

			




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

			




	
	
	
		
 
                  <div style="float:left">${member.full_name} (${_('owner')})</div>

			




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

			




        

    



    


    



    



      

      





    
    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.