Changeset - b3299a079fa6
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 10 years ago 2015-05-27 23:15:36
madski@unity3d.com
comments: introduce .url method for linking to originating PR or changeset page
5 files changed with 12 insertions and 5 deletions:
kallithea/model/db.py
7
kallithea/templates/changelog/changelog.html
2
2
kallithea/templates/changelog/changelog_summary_data.html
1
1
kallithea/templates/changeset/changeset_file_comment.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -2138,96 +2138,103 @@ class CacheInvalidation(Base, BaseModel)
 

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetComment(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'changeset_comments'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        Index('cc_revision_idx', 'revision'),

			




	
	
	
		
 
        Index('cc_pull_request_id_idx', 'pull_request_id'),

			




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

			




	
	
	
		
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},

			




	
	
	
		
 
    )

			




	
	
	
		
 
    comment_id = Column(Integer(), nullable=False, unique=True, primary_key=True)

			




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

			




	
	
	
		
 
    revision = Column(String(40))

			




	
	
	
		
 
    pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'))

			




	
	
	
		
 
    line_no = Column(Unicode(10))

			




	
	
	
		
 
    hl_lines = Column(Unicode(512))

			




	
	
	
		
 
    f_path = Column(Unicode(1000))

			




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

			




	
	
	
		
 
    text = Column(UnicodeText(25000), nullable=False)

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    author = relationship('User')

			




	
	
	
		
 
    repo = relationship('Repository')

			




	
	
	
		
 
    # status_change is frequently used directly in templates - make it a lazy

			




	
	
	
		
 
    # join to avoid fetching each related ChangesetStatus on demand.

			




	
	
	
		
 
    # There will only be one ChangesetStatus referencing each comment so the join will not explode.

			




	
	
	
		
 
    status_change = relationship('ChangesetStatus',

			




	
	
	
		
 
                                 cascade="all, delete-orphan", lazy='joined')

			




	
	
	
		
 
    pull_request = relationship('PullRequest')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_users(cls, revision=None, pull_request_id=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns user associated with this ChangesetComment. ie those

			




	
	
	
		
 
        who actually commented

			




	
	
	
		
 

			




	
	
	
		
 
        :param cls:

			




	
	
	
		
 
        :param revision:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        q = Session().query(User)\

			




	
	
	
		
 
                .join(ChangesetComment.author)

			




	
	
	
		
 
        if revision is not None:

			




	
	
	
		
 
            q = q.filter(cls.revision == revision)

			




	
	
	
		
 
        elif pull_request_id is not None:

			




	
	
	
		
 
            q = q.filter(cls.pull_request_id == pull_request_id)

			




	
	
	
		
 
        return q.all()

			




	
	
	
		
 

			




	
	
	
		
 
    def url(self):

			




	
	
	
		
 
        anchor = "comment-%s" % self.comment_id

			




	
	
	
		
 
        import kallithea.lib.helpers as h

			




	
	
	
		
 
        if self.revision:

			




	
	
	
		
 
            return h.url('changeset_home', repo_name=self.repo.repo_name, revision=self.revision, anchor=anchor)

			




	
	
	
		
 
        elif self.pull_request_id is not None:

			




	
	
	
		
 
            return self.pull_request.url(anchor=anchor)

			




	
	
	
		
 

			




	
	
	
		
 
class ChangesetStatus(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'changeset_statuses'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        Index('cs_revision_idx', 'revision'),

			




	
	
	
		
 
        Index('cs_version_idx', 'version'),

			




	
	
	
		
 
        Index('cs_pull_request_id_idx', 'pull_request_id'),

			




	
	
	
		
 
        Index('cs_changeset_comment_id_idx', 'changeset_comment_id'),

			




	
	
	
		
 
        Index('cs_pull_request_id_user_id_version_idx', 'pull_request_id', 'user_id', 'version'),

			




	
	
	
		
 
        UniqueConstraint('repo_id', 'revision', 'version'),

			




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

			




	
	
	
		
 
         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 
    STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'

			




	
	
	
		
 
    STATUS_APPROVED = 'approved'

			




	
	
	
		
 
    STATUS_REJECTED = 'rejected'

			




	
	
	
		
 
    STATUS_UNDER_REVIEW = 'under_review'

			




	
	
	
		
 

			




	
	
	
		
 
    STATUSES = [

			




	
	
	
		
 
        (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default

			




	
	
	
		
 
        (STATUS_APPROVED, _("Approved")),

			




	
	
	
		
 
        (STATUS_REJECTED, _("Rejected")),

			




	
	
	
		
 
        (STATUS_UNDER_REVIEW, _("Under Review")),

			




	
	
	
		
 
    ]

			




	
	
	
		
 

			




	
	
	
		
 
    changeset_status_id = Column(Integer(), nullable=False, unique=True, primary_key=True)

			




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

			




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

			




	
	
	
		
 
    revision = Column(String(40), nullable=False)

			




	
	
	
		
 
    status = Column(String(128), nullable=False, default=DEFAULT)

			




	
	
	
		
 
    changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'))

			




	
	
	
		
 
    modified_at = Column(DateTime(), nullable=False, default=datetime.datetime.now)

			




	
	
	
		
 
    version = Column(Integer(), nullable=False, default=0)

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    author = relationship('User')

			




	
	
	
		
 
    repo = relationship('Repository')

			




	
	
	
		
 
    comment = relationship('ChangesetComment')

			




	
	
	
		
 
    pull_request = relationship('PullRequest')

			




	
	
	
		
 

			




	
	
	
		
 
    def __unicode__(self):

			




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

			




	
	
	
		
 
            self.__class__.__name__,

			




	
	
	
		
 
            self.status, self.author

			




	
	
	
		
 
        )

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
	
		
 
    def get_status_lbl(cls, value):

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -48,126 +48,126 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                        ${h.end_form()}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        <div style="float: right; margin: 0px 0px 0px 4px">

			




	
	
	
		
 
                            <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a>

			




	
	
	
		
 
                            <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

			




	
	
	
		
 
                            %if c.revision:

			




	
	
	
		
 
                                <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}">

			




	
	
	
		
 
                                    ${_('Go to tip of repository')}

			




	
	
	
		
 
                                </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            %if c.db_repo.fork:

			




	
	
	
		
 
                                <a id="compare_fork"

			




	
	
	
		
 
                                   title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"

			




	
	
	
		
 
                                   href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"

			




	
	
	
		
 
                                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            ## text and href of open_new_pr is controlled from javascript

			




	
	
	
		
 
                            <a id="open_new_pr" class="btn btn-small"></a>

			




	
	
	
		
 
                            ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <div id="changelog" style="clear:both">

			




	
	
	
		
 

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">

			




	
	
	
		
 

			




	
	
	
		
 
                <table id="changesets">

			




	
	
	
		
 
                <tbody>

			




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

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
                        <td class="checkbox">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range")}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        <td class="status">

			




	
	
	
		
 
                          %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                            <div class="changeset-status-ico">

			




	
	
	
		
 
                            %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                                <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author">

			




	
	
	
		
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




	
	
	
		
 
                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">

			




	
	
	
		
 
                                <span class="changeset_hash">${h.show_id(cs)}</span>

			




	
	
	
		
 
                            </a>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                                                <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                                    ${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                                                    <i class="icon-comment-discussion"></i>

			




	
	
	
		
 
                                                </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




	
	
	
		
 
                                            <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                                ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        %endfor

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %for tag in cs.tags:

			




	
	
	
		
 
                                        <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                            ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and cs.branch:

			




	
	
	
		
 
                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




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

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="pagination-wh pagination-left">

			




	
	
	
		
 
                    ${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                //Monitor range checkboxes and build a link to changesets ranges

			




	
	
	
		
 
                var checkboxes = YUD.getElementsByClassName('changeset_range');

			




	
	
	
		
 
                // register extra routes needed for this view

			




	
	
	
		
 
                pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e){

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
<table>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left"></th>

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    </tr>

			




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

			




	
	
	
		
 
    <tr class="parity${cnt%2}">

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
            <div class="changeset-status-container">

			




	
	
	
		
 
              %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                <span class="changeset-status-ico shortlog">

			




	
	
	
		
 
                %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                    <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
              %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div title="${('comments')}">

			




	
	
	
		
 
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                       <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                %for book in cs.bookmarks:

			




	
	
	
		
 
                    <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                        ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            %for tag in cs.tags:

			




	
	
	
		
 
             <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            %if cs.branch:

			




	
	
	
		
 
             <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




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

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</table>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="pagination-wh pagination-left">

			




	
	
	
		
 
${c.repo_changesets.pager('$link_previous ~2~ $link_next')}

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%else:

			




	
	
	
		
 

			




	
	
	
		
 
%if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

			




	
	
	
		
 
<h4>${_('Add or upload files directly via Kallithea')}</h4>

			




	
	
	
		
 
<div style="margin: 20px 30px;">

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
## usage:

			




	
	
	
		
 
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
## ${comment.comment_block(co)}

			




	
	
	
		
 
##

			




	
	
	
		
 
<%def name="comment_block(co)">

			




	
	
	
		
 
  <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">

			




	
	
	
		
 
    <div class="comment-wrapp">

			




	
	
	
		
 
      <div class="meta">

			




	
	
	
		
 
          <div style="float:left">

			




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

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="user">

			




	
	
	
		
 
              ${co.author.username_and_name}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          <span>

			




	
	
	
		
 
              ${h.age(co.modified_at)}

			




	
	
	
		
 
              %if co.pull_request:

			




	
	
	
		
 
                ${_('on pull request')}

			




	
	
	
		
 
                <a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
                ${_('on this changeset')}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
              <a class="permalink" href="${co.url()}">&para;</a>

			




	
	
	
		
 
          </span>

			




	
	
	
		
 

			




	
	
	
		
 
          %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
            <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="text">

			




	
	
	
		
 
        %if co.status_change:

			




	
	
	
		
 
           <div class="rst-block automatic-comment">

			




	
	
	
		
 
             <p>

			




	
	
	
		
 
               <span title="${_('Changeset status')}" class="changeset-status-lbl">${_("Status change")}: ${co.status_change[0].status_lbl}</span>

			




	
	
	
		
 
               <span class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></span>

			




	
	
	
		
 
             </p>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        %if co.text:

			




	
	
	
		
 
          ${h.rst_w_mentions(co.text)|n}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="comment_inline_form()">

			




	
	
	
		
 
<div id='comment-inline-form-template' style="display:none">

			




	
	
	
		
 
  <div class="comment-inline-form ac">

			




	
	
	
		
 
  %if c.authuser.username != 'default':

			




	
	
	
		
 
    ${h.form('#', class_='inline-form')}

			




	
	
	
		
 
      <div id="edit-container_{1}" class="clearfix">

			




	
	
	
		
 
        <div class="comment-help">${_('Commenting on line {1}.')}

			




	
	
	
		
 
          ${(_('Comments parsed using %s syntax with %s support.') % (

			




	
	
	
		
 
                 ('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
                   ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to notify another user'))

			




	
	
	
		
 
               )

			




	
	
	
		
 
            )|n

			




	
	
	
		
 
           }

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="mentions-container" id="mentions_container_{1}"></div>

			




	
	
	
		
 
        <textarea id="text_{1}" name="text" class="comment-block-ta yui-ac-input"></textarea>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="preview-container_{1}" class="clearfix" style="display:none">

			




	
	
	
		
 
        <div class="comment-help">

			




	
	
	
		
 
            ${_('Comment preview')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="preview-box_{1}" class="preview-box"></div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




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

			




	
	
	
		
 
  %else:

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.ancestor:

			




	
	
	
		
 
    <div class="ancestor">${_('Ancestor')}:

			




	
	
	
		
 
      ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_nodes">

			




	
	
	
		
 
        <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_content_pr" style="margin-left: 100px;">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




	
	
	
		
 
        <td style="width:50px">

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">

			




	
	
	
		
 
                <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
          %if c.cs_comments.get(cs.raw_id):

			




	
	
	
		
 
              <div class="comments-container">

			




	
	
	
		
 
                  <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                      <a href="${h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.cs_comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                      <a href="${c.cs_comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                          ${len(c.cs_comments[cs.raw_id])}

			




	
	
	
		
 
                          <i class="icon-comment"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td style="width: 140px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>

			




	
	
	
		
 
        <td><div class="gravatar" commit_id="${cs.raw_id}">${h.gravatar(h.email_or_none(cs.author), size=14)}</div></td>

			




	
	
	
		
 
        <td><div class="author">${h.person(cs.author)}</div></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>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.as_form:

			




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

			




	
	
	
		
 
      ## links should perhaps use ('rev', c.a_rev) instead ...

			




	
	
	
		
 
      ${h.link_to(_('Show merge diff'),

			




	
	
	
		
 
        h.url('compare_url',

			




	
	
	
		
 
          repo_name=c.a_repo.repo_name,

			




	
	
	
		
 
          org_ref_type=c.a_ref_type, org_ref_name=c.a_ref_name,

			




	
	
	
		
 
          other_repo=c.cs_repo.repo_name,

			




	
	
	
		
 
          other_ref_type=c.cs_ref_type, other_ref_name=c.cs_ref_name,

			




	
	
	
		
 
          merge='1')

			




	
	
	
		
 
        )}

			




	
	
	
		
 
      </div>

			




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

			




	
	
	
		
 
        ${_('Common ancestor')}:

			




	
	
	
		
 
        %if c.ancestor:

			




	
	
	
		
 
        ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
        ${_('No common ancestor found - repositories are unrelated')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.cs_ranges_org is not None:

			




        

    



    


    



    



      

      





    
    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.