Changeset - b486cf5da28d
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 11 years ago 2015-01-21 17:35:11
madski@unity3d.com
pullrequests: reverse the 'available' list - most recent first

Avoid reversing in the templates.

cs_revs should be reversed too. That is for another day.
2 files changed with 5 insertions and 4 deletions:
kallithea/controllers/pullrequests.py
4
3
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -567,13 +567,13 @@ class PullrequestsController(BaseRepoCon
 
        c.cs_repo = c.cs_repo
 
        c.cs_ranges = [org_scm_instance.get_changeset(x) for x in c.pull_request.revisions]
 
        c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ...
 
        revs = [ctx.revision for ctx in reversed(c.cs_ranges)]
 
        c.jsdata = json.dumps(graph_data(org_scm_instance, revs))
 

			




	
	
	
		
 
        c.available = []

			




	
	
	
		
 
        arevs = []

			




	
	
	
		
 
        c.cs_branch_name = c.cs_ref_name

			




	
	
	
		
 
        other_scm_instance = c.a_repo.scm_instance

			




	
	
	
		
 
        c.update_msg = ""

			




	
	
	
		
 
        c.update_msg_other = ""

			




	
	
	
		
 
        if org_scm_instance.alias == 'hg' and c.a_ref_name != 'ancestor':

			




	
	
	
		
 
            if c.cs_ref_type != 'branch':

			




	
	
		
 
@@ -581,38 +581,39 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
            c.a_branch_name = c.a_ref_name

			




	
	
	
		
 
            if c.a_ref_type != 'branch':

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    c.a_branch_name = other_scm_instance.get_changeset(c.a_ref_name).branch # use ref_type ?

			




	
	
	
		
 
                except EmptyRepositoryError:

			




	
	
	
		
 
                    c.a_branch_name = 'null' # not a branch name ... but close enough

			




	
	
	
		
 
            arevs = []

			




	
	
	
		
 
            # candidates: descendants of old head that are on the right branch

			




	
	
	
		
 
            #             and not are the old head itself ...

			




	
	
	
		
 
            #             and nothing at all if old head is a descendent of target ref name

			




	
	
	
		
 
            if other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name):

			




	
	
	
		
 
                c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name

			




	
	
	
		
 
            else: # look for children of PR head on source branch in org repo

			




	
	
	
		
 
                arevs = org_scm_instance._repo.revs('%s:: & branch(%s) - %s',

			




	
	
	
		
 
                                                    revs[0], c.cs_branch_name, revs[0])

			




	
	
	
		
 
                if arevs:

			




	
	
	
		
 
                    arevs = sorted(arevs, reverse=True)

			




	
	
	
		
 
                    if c.pull_request.is_closed():

			




	
	
	
		
 
                        c.update_msg = _('This pull request has been closed and can not be updated with descendent changes on %s:') % c.cs_branch_name

			




	
	
	
		
 
                    else:

			




	
	
	
		
 
                        c.update_msg = _('This pull request can be updated with descendent changes on %s:') % c.cs_branch_name

			




	
	
	
		
 
                    c.available = [org_scm_instance.get_changeset(x) for x in arevs]

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    c.update_msg = _('No changesets found for updating this pull request.')

			




	
	
	
		
 

			




	
	
	
		
 
            brevs = org_scm_instance._repo.revs('%s - %d - %ld', c.cs_branch_name, revs[0], arevs)

			




	
	
	
		
 
            if brevs:

			




	
	
	
		
 
                c.update_msg_other = _('Note: Branch %s has another head: %s.') % (c.cs_branch_name,

			




	
	
	
		
 
                    h.short_id(org_scm_instance.get_changeset((max(brevs))).raw_id))

			




	
	
	
		
 

			




	
	
	
		
 
        elif org_scm_instance.alias == 'git':

			




	
	
	
		
 
            c.update_msg = _("Git pull requests don't support updates yet.")

			




	
	
	
		
 

			




	
	
	
		
 
        c.available = [org_scm_instance.get_changeset(r) for r in arevs]

			




	
	
	
		
 

			




	
	
	
		
 
        raw_ids = [x.raw_id for x in c.cs_ranges]

			




	
	
	
		
 
        c.cs_comments = c.cs_repo.get_comments(raw_ids)

			




	
	
	
		
 
        c.statuses = c.cs_repo.statuses(raw_ids)

			




	
	
	
		
 

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -180,13 +180,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg}</div>

			




	
	
	
		
 
              %if c.available:

			




	
	
	
		
 
              <div style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px">

			




	
	
	
		
 
                <table class="noborder">

			




	
	
	
		
 
                  %for cnt, cs in enumerate(reversed(c.available)):

			




	
	
	
		
 
                  %for cnt, cs in enumerate(c.available):

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                    <td>${h.radio(name='updaterev', value=cs.raw_id)}</td>

			




	
	
	
		
 
                    <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
                    <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




        

    



    


    



    



      

      





    
    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.