Changeset - 2ab2eed4a70a
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 13 years ago 2013-01-18 01:48:07
marcin@python-works.com
implemented #725 Pull Request View - Show origin repo URL
3 files changed with 48 insertions and 1 deletions:
rhodecode/model/db.py
27
rhodecode/public/css/style.css
3
1
rhodecode/templates/pullrequests/pullrequest_show.html
18
0 comments (0 inline, 0 general)
rhodecode/model/db.py
➞
Show inline comments
 
@@ -885,96 +885,115 @@ class Repository(Base, BaseModel):
 

			




	
	
	
		
 
        :param cls:

			




	
	
	
		
 
        :param repo_name:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        from rhodecode.lib.utils import is_valid_repo

			




	
	
	
		
 

			




	
	
	
		
 
        return is_valid_repo(repo_name, cls.base_path())

			




	
	
	
		
 

			




	
	
	
		
 
    def get_api_data(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Common function for generating repo api data

			




	
	
	
		
 

			




	
	
	
		
 
        """

			




	
	
	
		
 
        repo = self

			




	
	
	
		
 
        data = dict(

			




	
	
	
		
 
            repo_id=repo.repo_id,

			




	
	
	
		
 
            repo_name=repo.repo_name,

			




	
	
	
		
 
            repo_type=repo.repo_type,

			




	
	
	
		
 
            clone_uri=repo.clone_uri,

			




	
	
	
		
 
            private=repo.private,

			




	
	
	
		
 
            created_on=repo.created_on,

			




	
	
	
		
 
            description=repo.description,

			




	
	
	
		
 
            landing_rev=repo.landing_rev,

			




	
	
	
		
 
            owner=repo.user.username,

			




	
	
	
		
 
            fork_of=repo.fork.repo_name if repo.fork else None,

			




	
	
	
		
 
            enable_statistics=repo.enable_statistics,

			




	
	
	
		
 
            enable_locking=repo.enable_locking,

			




	
	
	
		
 
            enable_downloads=repo.enable_downloads

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
        return data

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def lock(cls, repo, user_id):

			




	
	
	
		
 
        repo.locked = [user_id, time.time()]

			




	
	
	
		
 
        Session().add(repo)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def unlock(cls, repo):

			




	
	
	
		
 
        repo.locked = None

			




	
	
	
		
 
        Session().add(repo)

			




	
	
	
		
 
        Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def last_db_change(self):

			




	
	
	
		
 
        return self.updated_on

			




	
	
	
		
 

			




	
	
	
		
 
    def clone_url(self, **override):

			




	
	
	
		
 
        from pylons import url

			




	
	
	
		
 
        from urlparse import urlparse

			




	
	
	
		
 
        import urllib

			




	
	
	
		
 
        parsed_url = urlparse(url('home', qualified=True))

			




	
	
	
		
 
        default_clone_uri = '%(scheme)s://%(user)s%(pass)s%(netloc)s%(prefix)s%(path)s'

			




	
	
	
		
 
        decoded_path = safe_unicode(urllib.unquote(parsed_url.path))

			




	
	
	
		
 
        args = {

			




	
	
	
		
 
           'user': '',

			




	
	
	
		
 
           'pass': '',

			




	
	
	
		
 
           'scheme': parsed_url.scheme,

			




	
	
	
		
 
           'netloc': parsed_url.netloc,

			




	
	
	
		
 
           'prefix': decoded_path,

			




	
	
	
		
 
           'path': self.repo_name

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        args.update(override)

			




	
	
	
		
 
        return default_clone_uri % args

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # SCM PROPERTIES

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 

			




	
	
	
		
 
    def get_changeset(self, rev=None):

			




	
	
	
		
 
        return get_changeset_safe(self.scm_instance, rev)

			




	
	
	
		
 

			




	
	
	
		
 
    def get_landing_changeset(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns landing changeset, or if that doesn't exist returns the tip

			




	
	
	
		
 
        """

			




	
	
	
		
 
        cs = self.get_changeset(self.landing_rev) or self.get_changeset()

			




	
	
	
		
 
        return cs

			




	
	
	
		
 

			




	
	
	
		
 
    def update_changeset_cache(self, cs_cache=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Update cache of last changeset for repository, keys should be::

			




	
	
	
		
 

			




	
	
	
		
 
            short_id

			




	
	
	
		
 
            raw_id

			




	
	
	
		
 
            revision

			




	
	
	
		
 
            message

			




	
	
	
		
 
            date

			




	
	
	
		
 
            author

			




	
	
	
		
 

			




	
	
	
		
 
        :param cs_cache:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        from rhodecode.lib.vcs.backends.base import BaseChangeset

			




	
	
	
		
 
        if cs_cache is None:

			




	
	
	
		
 
            cs_cache = self.get_changeset()

			




	
	
	
		
 
        if isinstance(cs_cache, BaseChangeset):

			




	
	
	
		
 
            cs_cache = cs_cache.__json__()

			




	
	
	
		
 

			




	
	
	
		
 
        if cs_cache != self.changeset_cache:

			




	
	
	
		
 
            last_change = cs_cache.get('date') or self.last_change

			




	
	
	
		
 
            log.debug('updated repo %s with new cs cache %s' % (self, cs_cache))

			




	
	
	
		
 
            self.updated_on = last_change

			




	
	
	
		
 
            self.changeset_cache = cs_cache

			




	
	
	
		
 
            Session().add(self)

			




	
	
	
		
 
            Session().commit()

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def tip(self):

			




	
	
	
		
 
        return self.get_changeset('tip')

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def author(self):

			




	
	
	
		
 
        return self.tip.author

			




	
	
		
 
@@ -1749,96 +1768,104 @@ class ChangesetStatus(Base, BaseModel):

			




	
	
	
		
 

			




	
	
	
		
 
    def __unicode__(self):

			




	
	
	
		
 
        return u"<%s('%s:%s')>" % (

			




	
	
	
		
 
            self.__class__.__name__,

			




	
	
	
		
 
            self.status, self.author

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_status_lbl(cls, value):

			




	
	
	
		
 
        return dict(cls.STATUSES).get(value)

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def status_lbl(self):

			




	
	
	
		
 
        return ChangesetStatus.get_status_lbl(self.status)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class PullRequest(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'pull_requests'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    STATUS_NEW = u'new'

			




	
	
	
		
 
    STATUS_OPEN = u'open'

			




	
	
	
		
 
    STATUS_CLOSED = u'closed'

			




	
	
	
		
 

			




	
	
	
		
 
    pull_request_id = Column('pull_request_id', Integer(), nullable=False, primary_key=True)

			




	
	
	
		
 
    title = Column('title', Unicode(256), nullable=True)

			




	
	
	
		
 
    description = Column('description', UnicodeText(10240), nullable=True)

			




	
	
	
		
 
    status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW)

			




	
	
	
		
 
    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    updated_on = Column('updated_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)

			




	
	
	
		
 
    _revisions = Column('revisions', UnicodeText(20500))  # 500 revisions max

			




	
	
	
		
 
    org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)

			




	
	
	
		
 
    org_ref = Column('org_ref', Unicode(256), nullable=False)

			




	
	
	
		
 
    other_repo_id = Column('other_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)

			




	
	
	
		
 
    other_ref = Column('other_ref', Unicode(256), nullable=False)

			




	
	
	
		
 

			




	
	
	
		
 
    @hybrid_property

			




	
	
	
		
 
    def revisions(self):

			




	
	
	
		
 
        return self._revisions.split(':')

			




	
	
	
		
 

			




	
	
	
		
 
    @revisions.setter

			




	
	
	
		
 
    def revisions(self, val):

			




	
	
	
		
 
        self._revisions = ':'.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', lazy='joined')

			




	
	
	
		
 
    reviewers = relationship('PullRequestReviewers',

			




	
	
	
		
 
                             cascade="all, delete, 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, delete-orphan")

			




	
	
	
		
 

			




	
	
	
		
 
    def is_closed(self):

			




	
	
	
		
 
        return self.status == self.STATUS_CLOSED

			




	
	
	
		
 

			




	
	
	
		
 
    def __json__(self):

			




	
	
	
		
 
        return dict(

			




	
	
	
		
 
          revisions=self.revisions

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class PullRequestReviewers(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'pull_request_reviewers'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, user=None, pull_request=None):

			




	
	
	
		
 
        self.user = user

			




	
	
	
		
 
        self.pull_request = pull_request

			




	
	
	
		
 

			




	
	
	
		
 
    pull_requests_reviewers_id = Column('pull_requests_reviewers_id', Integer(), nullable=False, primary_key=True)

			




	
	
	
		
 
    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=False)

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    pull_request = relationship('PullRequest')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Notification(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'notifications'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        Index('notification_type_idx', 'type'),

			




	
	
	
		
 
        {'extend_existing': True, 'mysql_engine': 'InnoDB',

			




	
	
	
		
 
         'mysql_charset': 'utf8'},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    TYPE_CHANGESET_COMMENT = u'cs_comment'

			




	
	
	
		
 
    TYPE_MESSAGE = u'message'

			




	
	
	
		
 
    TYPE_MENTION = u'mention'

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2733,97 +2733,99 @@ h3.files_location {

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added,.changed,.removed {

			




	
	
	
		
 
	display: block;

			




	
	
	
		
 
	padding: 1px;

			




	
	
	
		
 
	color: #444444;

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	text-align: center;

			




	
	
	
		
 
	min-width: 15px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added {

			




	
	
	
		
 
	background: #CFC;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .changed {

			




	
	
	
		
 
	background: #FEA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .removed {

			




	
	
	
		
 
	background: #FAA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .merge {

			




	
	
	
		
 
  padding: 1px 3px 1px 3px;

			




	
	
	
		
 
  background-color: #fca062;

			




	
	
	
		
 
  font-size: 10px;

			




	
	
	
		
 
  font-weight: bold;

			




	
	
	
		
 
  color: #ffffff;

			




	
	
	
		
 
  text-transform: uppercase;

			




	
	
	
		
 
  white-space: nowrap;

			




	
	
	
		
 
  -webkit-border-radius: 3px;

			




	
	
	
		
 
  -moz-border-radius: 3px;

			




	
	
	
		
 
  border-radius: 3px;

			




	
	
	
		
 
  margin-right: 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .parent {

			




	
	
	
		
 
	color: #666666;

			




	
	
	
		
 
	clear:both;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags{

			




	
	
	
		
 
	padding: 2px 2px 2px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .branchtag,.right .logtags .tagtag,.right .logtags .booktag{

			




	
	
	
		
 
    margin: 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .logtags .branchtag,.logtags .branchtag {

			




	
	
	
		
 
.right .logtags .branchtag,

			




	
	
	
		
 
.logtags .branchtag,

			




	
	
	
		
 
.spantag {

			




	
	
	
		
 
  padding: 1px 3px 1px 3px;

			




	
	
	
		
 
  background-color: #bfbfbf;

			




	
	
	
		
 
  font-size: 10px;

			




	
	
	
		
 
  font-weight: bold;

			




	
	
	
		
 
  color: #ffffff;

			




	
	
	
		
 
  text-transform: uppercase;

			




	
	
	
		
 
  white-space: nowrap;

			




	
	
	
		
 
  -webkit-border-radius: 3px;

			




	
	
	
		
 
  -moz-border-radius: 3px;

			




	
	
	
		
 
  border-radius: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .branchtag a:hover,.logtags .branchtag a{

			




	
	
	
		
 
	color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .branchtag a:hover,.logtags .branchtag a:hover{

			




	
	
	
		
 
	text-decoration: none;

			




	
	
	
		
 
	color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .tagtag,.logtags .tagtag {

			




	
	
	
		
 
  padding: 1px 3px 1px 3px;

			




	
	
	
		
 
  background-color: #62cffc;

			




	
	
	
		
 
  font-size: 10px;

			




	
	
	
		
 
  font-weight: bold;

			




	
	
	
		
 
  color: #ffffff;

			




	
	
	
		
 
  text-transform: uppercase;

			




	
	
	
		
 
  white-space: nowrap;

			




	
	
	
		
 
  -webkit-border-radius: 3px;

			




	
	
	
		
 
  -moz-border-radius: 3px;

			




	
	
	
		
 
  border-radius: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .tagtag a:hover,.logtags .tagtag a{

			




	
	
	
		
 
	color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logtags .tagtag a:hover,.logtags .tagtag a:hover{

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    color: #ffffff;

			




	
	
	
		
 
}

			




	
	
	
		
 
.right .logbooks .bookbook,.logbooks .bookbook,.right .logtags .bookbook,.logtags .bookbook {

			




	
	
	
		
 
  padding: 1px 3px 1px 3px;

			




	
	
	
		
 
  background-color: #46A546;

			




	
	
	
		
 
  font-size: 10px;

			




	
	
	
		
 
  font-weight: bold;

			




	
	
	
		
 
  color: #ffffff;

			




	
	
	
		
 
  text-transform: uppercase;

			




	
	
	
		
 
  white-space: nowrap;

			




	
	
	
		
 
  -webkit-border-radius: 3px;

			




	
	
	
		
 
  -moz-border-radius: 3px;

			




	
	
	
		
 
  border-radius: 3px;

			




        

    


    
    

    

        

                

                    rhodecode/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,96 +6,114 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(_(u'Home'),h.url('/'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Pull request #%s') % c.pull_request.pull_request_id}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
        %if c.pull_request.is_closed():

			




	
	
	
		
 
        <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
    <h3>${_('Title')}: ${c.pull_request.title}</h3>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="form">

			




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

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




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

			




	
	
	
		
 
            %if c.current_changeset_status:

			




	
	
	
		
 
              <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></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>

			




	
	
	
		
 
            %else:

			




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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>

			




	
	
	
		
 
         <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
             ##%if h.is_hg(c.pull_request.org_repo):

			




	
	
	
		
 
             ##  <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>

			




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

			




	
	
	
		
 
             ##  <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>

			




	
	
	
		
 
             ##%endif

			




	
	
	
		
 
              <span class="spantag">${c.pull_request.org_ref_parts[0]}</span>

			




	
	
	
		
 
              :

			




	
	
	
		
 
              <span class="spantag">${c.pull_request.org_ref_parts[1]}</span>             

			




	
	
	
		
 
              <span>${c.pull_request.org_repo.clone_url()}</span> 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
         </div>         

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>

			




	
	
	
		
 
    <div style="padding:4px 4px 10px 20px">

			




	
	
	
		
 
      <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto;">

			




	
	
	
		
 
      ##DIFF

			




	
	
	
		
 
      <div class="table" style="float:left;clear:none">

			




	
	
	
		
 
          <div id="body" class="diffblock">

			




	
	
	
		
 
              <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="changeset_compare_view_content">

			




	
	
	
		
 
              ##CS

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %if not c.files:

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                    <div class="cs_${change}">

			




	
	
	
		
 
                      <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')}</h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ## REVIEWERS

			




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

			




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

			




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