kallithea Changeset - 6ec5fd198084

Changeset - 6ec5fd198084

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 11 years ago 2015-05-10 21:51:44
thomas.de.schampheleire@gmail.com

pullrequest/compare: add logical changeset index to clarify the order

Is the parent-most changeset in a changeset the one at the top or at the
bottom? When the revision numbers are not shown, it is not obvious to
determine this.

This commit adds a logical changeset index to the commit list in a
pullrequest or compare view. The index starts at 1 (the parent-most commit)
and has no relation whatsoever with the commit hash or revision number.

2 files changed with 23 insertions and 0 deletions:

kallithea/public/css/style.css

kallithea/templates/compare/compare_cs.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2286,48 +2286,56 @@ h3.files_location { @@
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .tablerow0 {
     background-color: #F8F8F8;
+}
 .tablerow1 {
     background-color: #FFFFFF;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset-logical-index {
     color: #666666;
     font-style: italic;
     font-size: 85%;
     padding-right: 0.5em;
     text-align: right;
+}
 .changeset_hash {
     color: #000000;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_compare_view_content {
     border: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .container {
     min-height: 100px;
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -15,48 +15,63 @@ @@
     </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="${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 class="changeset-logical-index">
           <%
               num_cs = len(c.cs_ranges)
               index = num_cs - cnt
               if index == 1:
                   title = _('First (oldest) changeset in this list')
               elif index == num_cs:
                   title = _('Last (most recent) changeset in this list')
               else:
                   title = _('Position in this list of changesets')
           %>
           <span class="tooltip" title="${title}">
             ${index}
           </span>
         </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',

0 comments (0 inline, 0 general)