Changeset - b1bec568c0a2
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Angel Ezquerra - 10 years ago 2016-02-21 12:04:43
angel.ezquerra@gmail.com
summary, changelog: add reviewer username to status change tooltips

Change the status change (circle) icon tooltips from "Changeset status:
NEW_STATE" to "Changeset status: NEWSTATE by REVIEWER_USERNAME".

This makes it much faster to check who is reviewing what and who approved or
rejected what.
3 files changed with 8 insertions and 5 deletions:
kallithea/model/db.py
2
1
kallithea/templates/changelog/changelog.html
3
2
kallithea/templates/changelog/changelog_summary_data.html
3
2
0 comments (0 inline, 0 general)
kallithea/model/db.py
➞
Show inline comments
 
@@ -1373,97 +1373,98 @@ class Repository(Base, BaseModel):
 
    @property
 
    def author(self):
 
        return self.tip.author
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def last_change(self):

			




	
	
	
		
 
        return self.scm_instance.last_change

			




	
	
	
		
 

			




	
	
	
		
 
    def get_comments(self, revisions=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns comments for this repository grouped by revisions

			




	
	
	
		
 

			




	
	
	
		
 
        :param revisions: filter query by revisions only

			




	
	
	
		
 
        """

			




	
	
	
		
 
        cmts = ChangesetComment.query() \

			




	
	
	
		
 
            .filter(ChangesetComment.repo == self)

			




	
	
	
		
 
        if revisions is not None:

			




	
	
	
		
 
            if not revisions:

			




	
	
	
		
 
                return [] # don't use sql 'in' on empty set

			




	
	
	
		
 
            cmts = cmts.filter(ChangesetComment.revision.in_(revisions))

			




	
	
	
		
 
        grouped = collections.defaultdict(list)

			




	
	
	
		
 
        for cmt in cmts.all():

			




	
	
	
		
 
            grouped[cmt.revision].append(cmt)

			




	
	
	
		
 
        return grouped

			




	
	
	
		
 

			




	
	
	
		
 
    def statuses(self, revisions):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns statuses for this repository.

			




	
	
	
		
 
        PRs without any votes do _not_ show up as unreviewed.

			




	
	
	
		
 

			




	
	
	
		
 
        :param revisions: list of revisions to get statuses for

			




	
	
	
		
 
        """

			




	
	
	
		
 
        if not revisions:

			




	
	
	
		
 
            return {}

			




	
	
	
		
 

			




	
	
	
		
 
        statuses = ChangesetStatus.query() \

			




	
	
	
		
 
            .filter(ChangesetStatus.repo == self) \

			




	
	
	
		
 
            .filter(ChangesetStatus.version == 0) \

			




	
	
	
		
 
            .filter(ChangesetStatus.revision.in_(revisions))

			




	
	
	
		
 

			




	
	
	
		
 
        grouped = {}

			




	
	
	
		
 
        for stat in statuses.all():

			




	
	
	
		
 
            pr_id = pr_nice_id = pr_repo = None

			




	
	
	
		
 
            if stat.pull_request:

			




	
	
	
		
 
                pr_id = stat.pull_request.pull_request_id

			




	
	
	
		
 
                pr_nice_id = PullRequest.make_nice_id(pr_id)

			




	
	
	
		
 
                pr_repo = stat.pull_request.other_repo.repo_name

			




	
	
	
		
 
            grouped[stat.revision] = [str(stat.status), stat.status_lbl,

			




	
	
	
		
 
                                      pr_id, pr_repo, pr_nice_id]

			




	
	
	
		
 
                                      pr_id, pr_repo, pr_nice_id,

			




	
	
	
		
 
                                      stat.author]

			




	
	
	
		
 
        return grouped

			




	
	
	
		
 

			




	
	
	
		
 
    def _repo_size(self):

			




	
	
	
		
 
        from kallithea.lib import helpers as h

			




	
	
	
		
 
        log.debug('calculating repository size...')

			




	
	
	
		
 
        return h.format_byte_size(self.scm_instance.size)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    # SCM CACHE INSTANCE

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    def set_invalidate(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Mark caches of this repo as invalid.

			




	
	
	
		
 
        """

			




	
	
	
		
 
        CacheInvalidation.set_invalidate(self.repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    def scm_instance_no_cache(self):

			




	
	
	
		
 
        return self.__get_instance()

			




	
	
	
		
 

			




	
	
	
		
 
    @property

			




	
	
	
		
 
    def scm_instance(self):

			




	
	
	
		
 
        import kallithea

			




	
	
	
		
 
        full_cache = str2bool(kallithea.CONFIG.get('vcs_full_cache'))

			




	
	
	
		
 
        if full_cache:

			




	
	
	
		
 
            return self.scm_instance_cached()

			




	
	
	
		
 
        return self.__get_instance()

			




	
	
	
		
 

			




	
	
	
		
 
    def scm_instance_cached(self, valid_cache_keys=None):

			




	
	
	
		
 
        @cache_region('long_term')

			




	
	
	
		
 
        def _c(repo_name):

			




	
	
	
		
 
            return self.__get_instance()

			




	
	
	
		
 
        rn = self.repo_name

			




	
	
	
		
 

			




	
	
	
		
 
        valid = CacheInvalidation.test_and_set_valid(rn, None, valid_cache_keys=valid_cache_keys)

			




	
	
	
		
 
        if not valid:

			




	
	
	
		
 
            log.debug('Cache for %s invalidated, getting new object', rn)

			




	
	
	
		
 
            region_invalidate(_c, None, rn)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            log.debug('Getting scm_instance of %s from cache', rn)

			




	
	
	
		
 
        return _c(rn)

			




	
	
	
		
 

			




	
	
	
		
 
    def __get_instance(self):

			




	
	
	
		
 
        repo_full_path = self.repo_full_path

			




	
	
	
		
 

			




	
	
	
		
 
        alias = get_scm(safe_str(repo_full_path))[0]

			




	
	
	
		
 
        log.debug('Creating instance of %s repository from %s',

			




	
	
	
		
 
                  alias, repo_full_path)

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -44,101 +44,102 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                            ${_('revisions')}

			




	
	
	
		
 
                            %if c.branch_name:

			




	
	
	
		
 
                            ${h.hidden('branch', c.branch_name)}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                          ${h.end_form()}

			




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

			




	
	
	
		
 
                        </div>

			




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

			




	
	
	
		
 
                            <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></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 repository (%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" style="width:0"></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 ${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
                        <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])}">

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, 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="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                              <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




	
	
	
		
 
                                 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 tooltip" title="${h.fmt_date(cs.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="${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:

			




        

    


    
    

    

        

                

                    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])}">

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, 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="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




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

			




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

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




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

			




	
	
	
		
 
               <div class="comments-container">

			




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

			




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

			




        

    



    


    



    



      

      





    
    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.