Changeset - 68011c4e6f33
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 10 years ago 2015-08-26 17:28:59
madski@unity3d.com
pull requests: call it 'owner' instead of 'author'

Prepare for making it possible to transfer ownership of PRs.
7 files changed with 22 insertions and 25 deletions:
kallithea/controllers/pullrequests.py
2
2
kallithea/model/comment.py
2
2
kallithea/model/db.py
1
1
kallithea/model/pull_request.py
8
9
kallithea/templates/changeset/changeset_file_comment.html
1
1
kallithea/templates/pullrequests/pullrequest_data.html
3
3
kallithea/templates/pullrequests/pullrequest_show.html
5
7
0 comments (0 inline, 0 general)
kallithea/controllers/pullrequests.py
➞
Show inline comments
 
@@ -470,25 +470,25 @@ class PullrequestsController(BaseRepoCon
 

			




	
	
	
		
 
    # pullrequest_post for PR editing

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def post(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        if pull_request.is_closed():

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 
        assert pull_request.other_repo.repo_name == repo_name

			




	
	
	
		
 
        #only owner or admin can update it

			




	
	
	
		
 
        owner = pull_request.author.user_id == c.authuser.user_id

			




	
	
	
		
 
        owner = pull_request.owner.user_id == c.authuser.user_id

			




	
	
	
		
 
        repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)

			




	
	
	
		
 
        if not (h.HasPermissionAny('hg.admin') or repo_admin or owner):

			




	
	
	
		
 
            raise HTTPForbidden()

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        reviewers_ids = [int(s) for s in _form['review_members']]

			




	
	
	
		
 

			




	
	
	
		
 
        if _form['updaterev']:

			




	
	
	
		
 
            return self.create_update(pull_request,

			




	
	
	
		
 
                                      _form['updaterev'],

			




	
	
	
		
 
                                      _form['pullrequest_title'],

			




	
	
	
		
 
                                      _form['pullrequest_desc'],

			




	
	
		
 
@@ -508,25 +508,25 @@ class PullrequestsController(BaseRepoCon

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        return redirect(pull_request.url())

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @NotAnonymous()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    @jsonify

			




	
	
	
		
 
    def delete(self, repo_name, pull_request_id):

			




	
	
	
		
 
        pull_request = PullRequest.get_or_404(pull_request_id)

			




	
	
	
		
 
        #only owner can delete it !

			




	
	
	
		
 
        if pull_request.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
        if pull_request.owner.user_id == c.authuser.user_id:

			




	
	
	
		
 
            PullRequestModel().delete(pull_request)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 
            h.flash(_('Successfully deleted pull request'),

			




	
	
	
		
 
                    category='success')

			




	
	
	
		
 
            return redirect(url('my_pullrequests'))

			




	
	
	
		
 
        raise HTTPForbidden()

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def show(self, repo_name, pull_request_id, extra=None):

			




	
	
	
		
 
        repo_model = RepoModel()

			




        

    


    
    

    

        

                

                    kallithea/model/comment.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -83,25 +83,25 @@ class ChangesetCommentsModel(BaseModel):

			




	
	
	
		
 
                                                           h.canonical_hostname()))

			




	
	
	
		
 
            comment_url = h.canonical_url('changeset_home',

			




	
	
	
		
 
                repo_name=repo.repo_name,

			




	
	
	
		
 
                revision=revision,

			




	
	
	
		
 
                anchor='comment-%s' % comment.comment_id)

			




	
	
	
		
 
            subj = safe_unicode(

			




	
	
	
		
 
                h.link_to('Re changeset: %(desc)s %(line)s' % \

			




	
	
	
		
 
                          {'desc': desc, 'line': line},

			




	
	
	
		
 
                          comment_url)

			




	
	
	
		
 
            )

			




	
	
	
		
 
            # get the current participants of this changeset

			




	
	
	
		
 
            recipients = ChangesetComment.get_users(revision=revision)

			




	
	
	
		
 
            # add changeset author if it's in kallithea system

			




	
	
	
		
 
            # add changeset author if it's known locally

			




	
	
	
		
 
            cs_author = User.get_from_cs_author(cs.author)

			




	
	
	
		
 
            if not cs_author:

			




	
	
	
		
 
                #use repo owner if we cannot extract the author correctly

			




	
	
	
		
 
                cs_author = repo.user

			




	
	
	
		
 
            recipients += [cs_author]

			




	
	
	
		
 
            email_kwargs = {

			




	
	
	
		
 
                'status_change': status_change,

			




	
	
	
		
 
                'cs_comment_user': h.person(user, 'full_name_and_username'),

			




	
	
	
		
 
                'cs_target_repo': h.canonical_url('summary_home', repo_name=repo.repo_name),

			




	
	
	
		
 
                'cs_comment_url': comment_url,

			




	
	
	
		
 
                'raw_id': revision,

			




	
	
	
		
 
                'message': cs.message,

			




	
	
		
 
@@ -127,25 +127,25 @@ class ChangesetCommentsModel(BaseModel):

			




	
	
	
		
 
                anchor='comment-%s' % comment.comment_id)

			




	
	
	
		
 
            subj = safe_unicode(

			




	
	
	
		
 
                h.link_to('Re pull request %(pr_nice_id)s: %(desc)s %(line)s' % \

			




	
	
	
		
 
                          {'desc': desc,

			




	
	
	
		
 
                           'pr_nice_id': comment.pull_request.nice_id(),

			




	
	
	
		
 
                           'line': line},

			




	
	
	
		
 
                          comment_url)

			




	
	
	
		
 
            )

			




	
	
	
		
 
            # get the current participants of this pull request

			




	
	
	
		
 
            recipients = ChangesetComment.get_users(pull_request_id=

			




	
	
	
		
 
                                                pull_request.pull_request_id)

			




	
	
	
		
 
            # add pull request author

			




	
	
	
		
 
            recipients += [pull_request.author]

			




	
	
	
		
 
            recipients += [pull_request.owner]

			




	
	
	
		
 

			




	
	
	
		
 
            # add the reviewers to notification

			




	
	
	
		
 
            recipients += [x.user for x in pull_request.reviewers]

			




	
	
	
		
 

			




	
	
	
		
 
            #set some variables for email notification

			




	
	
	
		
 
            email_kwargs = {

			




	
	
	
		
 
                'pr_title': pull_request.title,

			




	
	
	
		
 
                'pr_nice_id': pull_request.nice_id(),

			




	
	
	
		
 
                'status_change': status_change,

			




	
	
	
		
 
                'closing_pr': closing_pr,

			




	
	
	
		
 
                'pr_comment_url': comment_url,

			




	
	
	
		
 
                'pr_comment_user': h.person(user, 'full_name_and_username'),

			




        

    


    
    

    

        

                

                    kallithea/model/db.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2294,25 +2294,25 @@ class PullRequest(Base, BaseModel):

			




	
	
	
		
 
    @revisions.setter

			




	
	
	
		
 
    def revisions(self, val):

			




	
	
	
		
 
        self._revisions = safe_unicode(':'.join(val))

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def org_ref_parts(self):

			




	
	
	
		
 
        return self.org_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def other_ref_parts(self):

			




	
	
	
		
 
        return self.other_ref.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
    author = relationship('User')

			




	
	
	
		
 
    owner = relationship('User')

			




	
	
	
		
 
    reviewers = relationship('PullRequestReviewers',

			




	
	
	
		
 
                             cascade="all, delete-orphan")

			




	
	
	
		
 
    org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id')

			




	
	
	
		
 
    other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')

			




	
	
	
		
 
    statuses = relationship('ChangesetStatus')

			




	
	
	
		
 
    comments = relationship('ChangesetComment',

			




	
	
	
		
 
                             cascade="all, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    def is_closed(self):

			




	
	
	
		
 
        return self.status == self.STATUS_CLOSED

			




	
	
	
		
 

			




	
	
	
		
 
    def user_review_status(self, user_id):

			




        

    


    
    

    

        

                

                    kallithea/model/pull_request.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -78,42 +78,42 @@ class PullRequestModel(BaseModel):

			




	
	
	
		
 
        created_by_user = self._get_user(created_by)

			




	
	
	
		
 
        org_repo = self._get_repo(org_repo)

			




	
	
	
		
 
        other_repo = self._get_repo(other_repo)

			




	
	
	
		
 

			




	
	
	
		
 
        new = PullRequest()

			




	
	
	
		
 
        new.org_repo = org_repo

			




	
	
	
		
 
        new.org_ref = org_ref

			




	
	
	
		
 
        new.other_repo = other_repo

			




	
	
	
		
 
        new.other_ref = other_ref

			




	
	
	
		
 
        new.revisions = revisions

			




	
	
	
		
 
        new.title = title

			




	
	
	
		
 
        new.description = description

			




	
	
	
		
 
        new.author = created_by_user

			




	
	
	
		
 
        new.owner = created_by_user

			




	
	
	
		
 
        Session().add(new)

			




	
	
	
		
 
        Session().flush()

			




	
	
	
		
 

			




	
	
	
		
 
        #reset state to under-review

			




	
	
	
		
 
        from kallithea.model.comment import ChangesetCommentsModel

			




	
	
	
		
 
        comment = ChangesetCommentsModel().create(

			




	
	
	
		
 
            text=u'',

			




	
	
	
		
 
            repo=org_repo,

			




	
	
	
		
 
            user=new.author,

			




	
	
	
		
 
            user=new.owner,

			




	
	
	
		
 
            pull_request=new,

			




	
	
	
		
 
            send_email=False,

			




	
	
	
		
 
            status_change=ChangesetStatus.STATUS_UNDER_REVIEW,

			




	
	
	
		
 
        )

			




	
	
	
		
 
        ChangesetStatusModel().set_status(

			




	
	
	
		
 
            org_repo,

			




	
	
	
		
 
            ChangesetStatus.STATUS_UNDER_REVIEW,

			




	
	
	
		
 
            new.author,

			




	
	
	
		
 
            new.owner,

			




	
	
	
		
 
            comment,

			




	
	
	
		
 
            pull_request=new

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        mention_recipients = set(User.get_by_username(username, case_insensitive=True)

			




	
	
	
		
 
                                 for username in extract_mentioned_users(new.description))

			




	
	
	
		
 
        self.__add_reviewers(new, reviewers, mention_recipients)

			




	
	
	
		
 

			




	
	
	
		
 
        return new

			




	
	
	
		
 

			




	
	
	
		
 
    def __add_reviewers(self, pr, reviewers, mention_recipients=None):

			




	
	
	
		
 
        #members

			




	
	
		
 
@@ -126,58 +126,57 @@ class PullRequestModel(BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
        revision_data = [(x.raw_id, x.message)

			




	
	
	
		
 
                         for x in map(pr.org_repo.get_changeset, pr.revisions)]

			




	
	
	
		
 

			




	
	
	
		
 
        #notification to reviewers

			




	
	
	
		
 
        pr_url = pr.url(canonical=True)

			




	
	
	
		
 
        threading = ['%s-pr-%s@%s' % (pr.other_repo.repo_name,

			




	
	
	
		
 
                                      pr.pull_request_id,

			




	
	
	
		
 
                                      h.canonical_hostname())]

			




	
	
	
		
 
        subject = safe_unicode(

			




	
	
	
		
 
            h.link_to(

			




	
	
	
		
 
              _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % \

			




	
	
	
		
 
                {'user': pr.author.username,

			




	
	
	
		
 
                {'user': pr.owner.username,

			




	
	
	
		
 
                 'pr_title': pr.title,

			




	
	
	
		
 
                 'pr_nice_id': pr.nice_id()},

			




	
	
	
		
 
                pr_url)

			




	
	
	
		
 
            )

			




	
	
	
		
 
        body = pr.description

			




	
	
	
		
 
        _org_ref_type, org_ref_name, _org_rev = pr.org_ref.split(':')

			




	
	
	
		
 
        email_kwargs = {

			




	
	
	
		
 
            'pr_title': pr.title,

			




	
	
	
		
 
            'pr_user_created': h.person(pr.author),

			




	
	
	
		
 
            'pr_user_created': h.person(pr.owner),

			




	
	
	
		
 
            'pr_repo_url': h.canonical_url('summary_home', repo_name=pr.other_repo.repo_name),

			




	
	
	
		
 
            'pr_url': pr_url,

			




	
	
	
		
 
            'pr_revisions': revision_data,

			




	
	
	
		
 
            'repo_name': pr.other_repo.repo_name,

			




	
	
	
		
 
            'pr_nice_id': pr.nice_id(),

			




	
	
	
		
 
            'ref': org_ref_name,

			




	
	
	
		
 
            'pr_username': pr.author.username,

			




	
	
	
		
 
            'pr_username': pr.owner.username,

			




	
	
	
		
 
            'threading': threading,

			




	
	
	
		
 
            'is_mention': False,

			




	
	
	
		
 
            }

			




	
	
	
		
 
        if reviewers:

			




	
	
	
		
 
            NotificationModel().create(created_by=pr.author, subject=subject, body=body,

			




	
	
	
		
 
            NotificationModel().create(created_by=pr.owner, subject=subject, body=body,

			




	
	
	
		
 
                                       recipients=reviewers,

			




	
	
	
		
 
                                       type_=Notification.TYPE_PULL_REQUEST,

			




	
	
	
		
 
                                       email_kwargs=email_kwargs)

			




	
	
	
		
 

			




	
	
	
		
 
        if mention_recipients:

			




	
	
	
		
 
            mention_recipients.discard(None)

			




	
	
	
		
 
            mention_recipients.difference_update(reviewers)

			




	
	
	
		
 
        if mention_recipients:

			




	
	
	
		
 
            email_kwargs['is_mention'] = True

			




	
	
	
		
 
            subject = _('[Mention]') + ' ' + subject

			




	
	
	
		
 

			




	
	
	
		
 
            NotificationModel().create(created_by=pr.author, subject=subject, body=body,

			




	
	
	
		
 
            NotificationModel().create(created_by=pr.owner, subject=subject, body=body,

			




	
	
	
		
 
                                       recipients=mention_recipients,

			




	
	
	
		
 
                                       type_=Notification.TYPE_PULL_REQUEST,

			




	
	
	
		
 
                                       email_kwargs=email_kwargs)

			




	
	
	
		
 

			




	
	
	
		
 
    def mention_from_description(self, pr, old_description=''):

			




	
	
	
		
 
        mention_recipients = set(User.get_by_username(username, case_insensitive=True)

			




	
	
	
		
 
                                 for username in extract_mentioned_users(pr.description))

			




	
	
	
		
 
        mention_recipients.difference_update(User.get_by_username(username, case_insensitive=True)

			




	
	
	
		
 
                                             for username in extract_mentioned_users(old_description))

			




	
	
	
		
 

			




	
	
	
		
 
        log.debug("Mentioning %s", mention_recipients)

			




	
	
	
		
 
        self.__add_reviewers(pr, [], mention_recipients)

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -162,25 +162,25 @@

			




	
	
	
		
 
                <label for="changeset_status_unchanged">

			




	
	
	
		
 
                  ${_('No change')}

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
                %for status,lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <span>

			




	
	
	
		
 
                        <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">

			




	
	
	
		
 
                        <label for="${status}"><i class="icon-circle changeset-status-${status}" /></i>${lbl}</label>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                %if is_pr and ( \

			




	
	
	
		
 
                    h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) \

			




	
	
	
		
 
                    or c.pull_request.author.user_id == c.authuser.user_id):

			




	
	
	
		
 
                    or c.pull_request.owner.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  <input id="save_close" type="checkbox" name="save_close">

			




	
	
	
		
 
                  <label id="save_close_label" for="save_close">${_("Close")}</label>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="preview-container" class="clearfix" style="display:none">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${_('Comment preview')}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="preview-box" class="preview-box"></div>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,25 +4,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
%if not len(pullrequests):

			




	
	
	
		
 
    <div class="normal-indent empty_data">${_('No entries')}</div>

			




	
	
	
		
 
    <% return %>

			




	
	
	
		
 
%endif

			




	
	
	
		
 

			




	
	
	
		
 
<div class="table">

			




	
	
	
		
 
  <table>

			




	
	
	
		
 
    <thead>

			




	
	
	
		
 
      <tr>

			




	
	
	
		
 
        <th class="left">${_('Vote')}</th>

			




	
	
	
		
 
        <th class="left">${_('Title')}</th>

			




	
	
	
		
 
        <th class="left">${_('Author')}</th>

			




	
	
	
		
 
        <th class="left">${_('Owner')}</th>

			




	
	
	
		
 
        <th class="left">${_('Age')}</th>

			




	
	
	
		
 
        <th class="left">${_('From')}</th>

			




	
	
	
		
 
        <th class="left">${_('To')}</th>

			




	
	
	
		
 
        <th class="right" style="padding-right:5px">${_('Delete')}</th>

			




	
	
	
		
 
      </tr>

			




	
	
	
		
 
    </thead>

			




	
	
	
		
 
% for pr in pullrequests:

			




	
	
	
		
 
    <tr class="${'pr-closed' if pr.is_closed() else ''}">

			




	
	
	
		
 
      <td width="80px">

			




	
	
	
		
 
        <% status = pr.user_review_status(c.authuser.user_id) %>

			




	
	
	
		
 
        %if status:

			




	
	
	
		
 
          <i class="icon-circle changeset-status-${status}" title="${_("You voted: %s") % status}"></i>

			




	
	
		
 
@@ -30,45 +30,45 @@

			




	
	
	
		
 
          <i class="icon-circle changeset-status-not_reviewed" title="${_("You didn't vote")}"></i>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td>

			




	
	
	
		
 
        <a href="${pr.url()}">

			




	
	
	
		
 
        ${pr.title or _("(no title)")}

			




	
	
	
		
 
        %if pr.is_closed():

			




	
	
	
		
 
          <span class="pr-closed-tag">${_('Closed')}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td>

			




	
	
	
		
 
        ${pr.author.full_name_and_username}

			




	
	
	
		
 
        ${pr.owner.full_name_and_username}

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td>

			




	
	
	
		
 
        <span class="tooltip" title="${h.fmt_date(pr.created_on)}">

			




	
	
	
		
 
          ${h.age(pr.created_on)}

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td>

			




	
	
	
		
 
        <% org_ref_name=pr.org_ref.rsplit(':', 2)[-2] %>

			




	
	
	
		
 
        <a href="${h.url('summary_home', repo_name=pr.org_repo.repo_name, anchor=org_ref_name)}">

			




	
	
	
		
 
          ${pr.org_repo.repo_name}#${org_ref_name}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td>

			




	
	
	
		
 
        <% other_ref_name=pr.other_ref.rsplit(':', 2)[-2] %>

			




	
	
	
		
 
        <a href="${h.url('summary_home', repo_name=pr.other_repo.repo_name, anchor=other_ref_name)}">

			




	
	
	
		
 
          ${pr.other_repo.repo_name}#${other_ref_name}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
      </td>

			




	
	
	
		
 
      <td style="text-align:right">

			




	
	
	
		
 
        %if pr.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
        %if pr.owner.user_id == c.authuser.user_id:

			




	
	
	
		
 
          ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id),method='delete', style="display:inline-block")}

			




	
	
	
		
 
          <button class="action_button"

			




	
	
	
		
 
                  id="remove_${pr.pull_request_id}"

			




	
	
	
		
 
                  name="remove_${pr.pull_request_id}"

			




	
	
	
		
 
                  title="${_('Delete Pull Request')}"

			




	
	
	
		
 
                  onclick="return confirm('${_('Confirm to delete this pull request')}')

			




	
	
	
		
 
                      && ((${len(pr.comments)} == 0) ||

			




	
	
	
		
 
                          confirm('${_('Confirm again to delete this pull request with %s comments') % len(pr.comments)}'))

			




	
	
	
		
 
                      ">

			




	
	
	
		
 
            <i class="icon-minus-circled"></i>

			




	
	
	
		
 
          </button>

			




	
	
	
		
 
          ${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,25 +6,25 @@

			




	
	
	
		
 
    ${_('%s Pull Request %s') % (c.repo_name, c.pull_request.nice_id())}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Pull request %s from %s#%s') % (c.pull_request.nice_id(), c.pull_request.org_repo.repo_name, c.cs_branch_name)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id) %>

			




	
	
	
		
 
<% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.owner.user_id == c.authuser.user_id) %>

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
  <!-- box / title -->

			




	
	
	
		
 
  <div class="title">

			




	
	
	
		
 
    ${self.breadcrumbs()}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 

			




	
	
	
		
 
  ${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="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():

			




	
	
		
 
@@ -142,34 +142,32 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </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 class="label-summary">

			




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

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div class="author">

			




	
	
	
		
 
                  <div class="gravatar">

			




	
	
	
		
 
                    ${h.gravatar(c.pull_request.author.email, size=20)}

			




	
	
	
		
 
                    ${h.gravatar(c.pull_request.owner.email, size=20)}

			




	
	
	
		
 
                  </div>

			




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

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
                  <span>${c.pull_request.owner.full_name_and_username}</span><br/>

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label-summary">

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




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

			




	
	
	
		
 
              %if c.avail_revs:

			




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

			




	
	
	
		
 
                <div style="height:0">

			




        

    



    


    



    



      

      





    
    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.