# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-08-26 17:28:59
# Node ID 8c5d1e94f9ee003e01fc731eb804c9a016601043
# Parent  8fcf31ac11054d51f360050afcda174444373c30

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

TODO: also in other views

diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -2375,6 +2375,10 @@ BIN_FILENODE = 6
     border-color: #cdcdcd;
 }
 
+#graph_content #changesets tr.mergerow {
+    opacity: 0.5;
+}
+
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -78,7 +78,7 @@ ${self.repo_context_bar('changelog', c.f
                 <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")}
diff --git a/kallithea/tests/functional/test_changelog.py b/kallithea/tests/functional/test_changelog.py
--- a/kallithea/tests/functional/test_changelog.py
+++ b/kallithea/tests/functional/test_changelog.py
@@ -8,7 +8,7 @@ class TestChangelogController(TestContro
         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" """
@@ -54,7 +54,7 @@ class TestChangelogController(TestContro
         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" """