kallithea Changeset - 8c5d1e94f9ee

Changeset - 8c5d1e94f9ee

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 10 years ago 2015-08-26 17:28:59
madski@unity3d.com

changelog: show merges as semi-opaque - they are usually not interesting

TODO: also in other views

3 files changed with 7 insertions and 3 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

kallithea/tests/functional/test_changelog.py

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2366,24 +2366,28 @@ BIN_FILENODE = 6 @@
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content #changesets tr.mergerow {
     opacity: 0.5;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content .container .checkbox {
     width: 12px;
     font-size: 0.85em;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -69,25 +69,25 @@ ${self.repo_context_bar('changelog', c.f @@
                 </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">
+                    <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])}">
                                 <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

kallithea/tests/functional/test_changelog.py

➞

Show inline comments

 from kallithea.tests import *
 class TestChangelogController(TestController):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=HG_REPO))
         response.mustcontain('''id="chg_20" class="container"''')
+        response.mustcontain('''id="chg_20" class="container mergerow"''')
         response.mustcontain(
             """<input class="changeset_range" """
             """id="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """name="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """
             """type="checkbox" value="1" />"""
+        )
         #rev 640: code garden
         response.mustcontain(
             """<span class="changeset_hash">r640:0a4e54a44604</span>"""
+        )
         response.mustcontain("""code garden""")
@@ @@ -45,25 +45,25 @@ class TestChangelogController(TestContro @@
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<span class="changeset_hash">r539:22baf968d547</span>"""
+        )
     def test_index_git(self):
         self.log_user()
         response = self.app.get(url(controller='changelog', action='index',
                                     repo_name=GIT_REPO))
         response.mustcontain('''id="chg_20" class="container"''')
+        response.mustcontain('''id="chg_20" class="container "''') # why no mergerow for git?
         response.mustcontain(
             """<input class="changeset_range" """
             """id="95f9a91d775b0084b2368ae7779e44931c849c0e" """
             """name="95f9a91d775b0084b2368ae7779e44931c849c0e" """
             """type="checkbox" value="1" />"""
+        )
         response.mustcontain(
             """<span class="changeset_hash">r613:95f9a91d775b</span>"""
+        )
         response.mustcontain("""fixing stupid typo in context for mercurial""")

0 comments (0 inline, 0 general)