Changeset - 96bd919192b0
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com
pull requests: simple editing
4 files changed with 101 insertions and 29 deletions:
kallithea/config/routing.py
5
kallithea/controllers/pullrequests.py
21
2
kallithea/model/forms.py
11
kallithea/templates/pullrequests/pullrequest_show.html
64
27
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -695,12 +695,17 @@ def make_map(config):
 

			




	
	
	
		
 
    rmap.connect('pullrequest_show',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',

			




	
	
	
		
 
                 controller='pullrequests',

			




	
	
	
		
 
                 action='show', conditions=dict(function=check_repo,

			




	
	
	
		
 
                                                method=["GET"]))

			




	
	
	
		
 
    rmap.connect('pullrequest_post',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',

			




	
	
	
		
 
                 controller='pullrequests',

			




	
	
	
		
 
                 action='post', conditions=dict(function=check_repo,

			




	
	
	
		
 
                                                method=["POST"]))

			




	
	
	
		
 
    rmap.connect('pullrequest_update',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request/{pull_request_id}',

			




	
	
	
		
 
                 controller='pullrequests',

			




	
	
	
		
 
                 action='update', conditions=dict(function=check_repo,

			




	
	
	
		
 
                                                method=["PUT"]))

			




	
	
	
		
 
    rmap.connect('pullrequest_delete',

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,13 +52,13 @@ from kallithea.model.db import  PullRequ

			




	
	
	
		
 
    PullRequestReviewers

			




	
	
	
		
 
from kallithea.model.pull_request import PullRequestModel

			




	
	
	
		
 
from kallithea.model.meta import Session

			




	
	
	
		
 
from kallithea.model.repo import RepoModel

			




	
	
	
		
 
from kallithea.model.comment import ChangesetCommentsModel

			




	
	
	
		
 
from kallithea.model.changeset_status import ChangesetStatusModel

			




	
	
	
		
 
from kallithea.model.forms import PullRequestForm

			




	
	
	
		
 
from kallithea.model.forms import PullRequestForm, PullRequestPostForm

			




	
	
	
		
 
from kallithea.lib.utils2 import safe_int

			




	
	
	
		
 
from kallithea.controllers.changeset import anchor_url, _ignorews_url,\

			




	
	
	
		
 
    _context_url, get_line_ctx, get_ignore_ws

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
		
 
@@ -379,13 +379,13 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        revisions = [x for x in reversed(_form['revisions'])]

			




	
	
	
		
 
        reviewers = _form['review_members']

			




	
	
	
		
 

			




	
	
	
		
 
        title = _form['pullrequest_title']

			




	
	
	
		
 
        if not title:

			




	
	
	
		
 
            title = '%s#%s to %s' % (org_repo, org_ref.split(':', 2)[1], other_repo)

			




	
	
	
		
 
        description = _form['pullrequest_desc']

			




	
	
	
		
 
        description = _form['pullrequest_desc'].strip() or _('No description')

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            pull_request = PullRequestModel().create(

			




	
	
	
		
 
                self.authuser.user_id, org_repo, org_ref, other_repo,

			




	
	
	
		
 
                other_ref, revisions, reviewers, title, description

			




	
	
	
		
 
            )

			




	
	
	
		
 
            Session().commit()

			




	
	
		
 
@@ -401,12 +401,31 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
                            pull_request_id=pull_request.pull_request_id))

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def post(self, repo_name, pull_request_id):

			




	
	
	
		
 
        repo = RepoModel()._get_repo(repo_name)

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 

			




	
	
	
		
 
        _form = PullRequestPostForm()().to_python(request.POST)

			




	
	
	
		
 

			




	
	
	
		
 
        pull_request.title = _form['pullrequest_title']

			




	
	
	
		
 
        pull_request.description = _form['pullrequest_desc'].strip() or _('No description')

			




	
	
	
		
 

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 
        h.flash(_('Pull request updated'), category='success')

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(url('pullrequest_show', repo_name=repo.repo_name,

			




	
	
	
		
 
                            pull_request_id=pull_request_id))

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def update(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        if pull_request.is_closed():

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 
        #only owner or admin can update it

			




        

    


    
    

    

        

                

                    kallithea/model/forms.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -499,12 +499,23 @@ def PullRequestForm(repo_id):

			




	
	
	
		
 
        ancestor_rev = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        merge_rev = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 

			




	
	
	
		
 
    return _PullRequestForm

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def PullRequestPostForm():

			




	
	
	
		
 
    class _PullRequestPostForm(formencode.Schema):

			




	
	
	
		
 
        allow_extra_fields = True

			




	
	
	
		
 
        filter_extra_fields = True

			




	
	
	
		
 

			




	
	
	
		
 
        pullrequest_title = v.UnicodeString(strip=True, required=True)

			




	
	
	
		
 
        pullrequest_desc = v.UnicodeString(strip=True, required=False)

			




	
	
	
		
 

			




	
	
	
		
 
    return _PullRequestPostForm

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def GistForm(lifetime_options):

			




	
	
	
		
 
    class _GistForm(formencode.Schema):

			




	
	
	
		
 

			




	
	
	
		
 
        filename = All(v.BasePath()(),

			




	
	
	
		
 
                       v.UnicodeString(strip=True, required=False))

			




	
	
	
		
 
        description = v.UnicodeString(required=False, if_missing='')

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,20 +21,65 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="form pr-box" style="float: left">

			




	
	
	
		
 
        <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
            ${_('Title')}: ${c.pull_request.title}

			




	
	
	
		
 
            %if c.pull_request.is_closed():

			




	
	
	
		
 
                (${_('Closed')})

			




	
	
	
		
 
      <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
          ${_('Title')}: ${c.pull_request.title}

			




	
	
	
		
 
          %if c.pull_request.is_closed():

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="pr-summary" class="fields">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field pr-not-edit" style="min-height:37px">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




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

			




	
	
	
		
 
            <div style="margin: 5px">

			




	
	
	
		
 
              <a class="btn btn-mini" onclick="YUD.setStyle('pr-edit-form','display','');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','none')">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div style="white-space:pre-wrap; line-height: 14px">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      <div id="summary" class="fields">

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        <div id="pr-edit-form" style="display:none">

			




	
	
	
		
 
          ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}

			




	
	
	
		
 

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
              <div class="label-summary">

			




	
	
	
		
 
                  <label for="pullrequest_title">${_('Title')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="input">

			




	
	
	
		
 
                  ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
              <div class="label-summary label-textarea">

			




	
	
	
		
 
                  <label for="pullrequest_desc">${_('Description')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="textarea text-area editor">

			




	
	
	
		
 
                  ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <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>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




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

			




	
	
	
		
 
            %if c.current_changeset_status:

			




	
	
		
 
@@ -47,51 +92,51 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_changeset_status)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </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>

			




	
	
	
		
 
            %else:

			




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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </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

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name, anchor=c.org_ref_name)}">${c.org_ref_type}: ${c.org_ref_name}</a></span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




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

			




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

			




	
	
	
		
 
              <span class="spantag"><a href="${h.url('summary_home', repo_name=c.pull_request.other_repo.repo_name, anchor=c.other_ref_name)}">${c.other_ref_type}: ${c.other_ref_name}</a></span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Pull changes')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
               ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?

			




	
	
		
 
@@ -99,43 +144,35 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                 <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>

			




	
	
	
		
 
               %elif h.is_git(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div style="white-space:pre-wrap">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created on')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created by')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div class="author">

			




	
	
	
		
 
                  <div class="gravatar">

			




	
	
	
		
 
                      <img alt="gravatar" src="${h.gravatar_url(c.pull_request.author.email,20)}"/>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  <span>${c.pull_request.author.username_and_name}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.author.email}">${c.pull_request.author.email}</a></span><br/>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </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">

			




        

    



    


    



    



      

      





    
    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.