Merge pull request #60 from codecov/dana/files-patch-cov

show patch coverage only for changed files, and don't show indirect changed files

services/notification/notifiers/mixins/message/helpers.py

@@ -116,6 +116,53 @@ def make_metrics(before, after, relative, show_complexity, yaml):
     return "".join(("|", coverage, complexity, icon))
 
 
+def make_patch_only_metrics(before, after, relative, show_complexity, yaml):
+    if after is None:
+        # e.g. missing flags
+        coverage = " `?` |"
+
+    elif after is False:
+        # e.g. file deleted
+        coverage = " |"
+
+    else:
+        layout = " `{relative}` |"
+        coverage = layout.format(
+            relative=format_number_to_str(
+                yaml, relative.coverage if relative else 0, style="{0}%", if_null="\xF8"
+            ),
+        )
+    return "".join(("|", coverage))
+
+
+def get_metrics_function(hide_project_coverage):
+    if hide_project_coverage:
+        metrics = make_patch_only_metrics
+    else:
+        metrics = make_metrics
+    return metrics
+
+
+def get_table_header(hide_project_coverage, show_complexity):
+    if not hide_project_coverage:
+        table_header = (
+            "| Coverage \u0394 |"
+            + (" Complexity \u0394 |" if show_complexity else "")
+            + " |"
+        )
+    else:
+        table_header = "| Coverage |"
+
+    return table_header
+
+
+def get_table_layout(hide_project_coverage, show_complexity):
+    if hide_project_coverage:
+        return "|---|---|"
+    else:
+        return "|---|---|---|" + ("---|" if show_complexity else "")
+
+
 def format_number_to_str(
     yml, value, if_zero=None, if_null=None, plus=False, style="{0}"
 ) -> str:

services/notification/notifiers/mixins/message/sections.py

@@ -20,6 +20,9 @@
     diff_to_string,
     ellipsis,
     escape_markdown,
+    get_metrics_function,
+    get_table_header,
+    get_table_layout,
     make_metrics,
     sort_by_importance,
 )
@@ -464,11 +467,13 @@ async def do_write_section(self, comparison, diff, changes, links, behind_by=Non
         head_report = comparison.head.report
         if base_report is None:
             base_report = Report()
+        hide_project_coverage = self.settings.get("hide_project_coverage", False)
+        make_metrics_fn = get_metrics_function(hide_project_coverage)
         files_in_diff = [
             (
                 _diff["type"],
                 path,
-                make_metrics(
+                make_metrics_fn(
                     get_totals_from_file_in_reports(base_report, path) or False,
                     get_totals_from_file_in_reports(head_report, path) or False,
                     _diff["totals"],
@@ -487,12 +492,8 @@ async def do_write_section(self, comparison, diff, changes, links, behind_by=Non
             c.path for c in changes or []
         )
         if files_in_diff:
-            table_header = (
-                "| Coverage \u0394 |"
-                + (" Complexity \u0394 |" if self.show_complexity else "")
-                + " |"
-            )
-            table_layout = "|---|---|---|" + ("---|" if self.show_complexity else "")
+            table_header = get_table_header(hide_project_coverage, self.show_complexity)
+            table_layout = get_table_layout(hide_project_coverage, self.show_complexity)
             # add table headers
             yield (
                 "| [Files Changed]({0}?src=pr&el=tree) {1}".format(
@@ -539,7 +540,7 @@ def tree_cell(typ, path, metrics, _=None):
                     )
                 )
 
-        if changes:
+        if changes and not hide_project_coverage:
             len_changes_not_in_diff = len(all_files or []) - len(files_in_diff or [])
             if files_in_diff and len_changes_not_in_diff > 0:
                 yield ("")

services/notification/notifiers/tests/unit/test_comment.py

@@ -4163,11 +4163,9 @@ async def test_build_message_no_project_coverage(
             f"## [Codecov](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=h1) Report",
             f"Patch coverage is **`66.67%`** of modified lines.",
             f"",
-            f"| [Files Changed](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=tree) | Coverage Δ | Complexity Δ | |",
-            f"|---|---|---|---|",
-            f"| [file\\_1.go](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=tree#diff-ZmlsZV8xLmdv) | `62.50% <66.67%> (+12.50%)` | `10.00 <0.00> (-1.00)` | :arrow_up: |",
-            f"",
-            f"... and [1 file with indirect coverage changes](test.example.br/gh/{repository.slug}/pull/{pull.pullid}/indirect-changes?src=pr&el=tree-more)",
+            f"| [Files Changed](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=tree) | Coverage |",
+            f"|---|---|",
+            f"| [file\\_1.go](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=tree#diff-ZmlsZV8xLmdv) | `66.67%` |",
             f"",
             f"",
             f"[:umbrella: View full report in Codecov by Sentry](test.example.br/gh/{repository.slug}/pull/{pull.pullid}?src=pr&el=continue).   ",