Group logging under a project name header

Fixes #953

Author: spoorcc

CHANGELOG.rst

@@ -13,6 +13,7 @@ Release 0.12.0 (unreleased)
 * Fix extra newlines in patch for new files (#945)
 * Replace colored-logs and Halo with Rich (#960)
 * Respect `NO_COLOR <https://no-color.org/>`_ (#960)
+* Group logging under a project name header (#953)
 
 Release 0.11.0 (released 2026-01-03)
 ====================================

dfetch/commands/common.py

@@ -44,23 +44,19 @@ def _make_recommendation(
         recommendations (List[ProjectEntry]): List of recommendations
         childmanifest_path (str): Path to the source of recommendations
     """
-    logger.warning(
-        "\n".join(
-            [
-                "",
-                f'"{project.name}" depends on the following project(s) '
-                "which are not part of your manifest:",
-                f"(found in {childmanifest_path})",
-            ]
-        )
-    )
-
     recommendation_json = yaml.dump(
         [proj.as_yaml() for proj in recommendations],
         indent=4,
         sort_keys=False,
     )
-    logger.warning("")
-    for line in recommendation_json.splitlines():
-        logger.warning(line)
-    logger.warning("")
+    logger.print_warning_line(
+        project.name,
+        "\n".join(
+            [
+                f'"{project.name}" depends on the following project(s) which are not part of your manifest:',
+                f"(found in {childmanifest_path})",
+                "",
+                recommendation_json,
+            ]
+        ),
+    )

dfetch/commands/environment.py

@@ -23,6 +23,8 @@ def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None
 
     def __call__(self, _: argparse.Namespace) -> None:
         """Perform listing the environment."""
-        logger.print_info_line("platform", f"{platform.system()} {platform.release()}")
+        logger.print_report_line(
+            "platform", f"{platform.system()} {platform.release()}"
+        )
         for project_type in SUPPORTED_PROJECT_TYPES:
             project_type.list_tool_info()

dfetch/commands/validate.py

@@ -35,4 +35,4 @@ def __call__(self, args: argparse.Namespace) -> None:
         manifest_path = find_manifest()
         parse(manifest_path)
         manifest_path = os.path.relpath(manifest_path, os.getcwd())
-        logger.print_info_line(manifest_path, "valid")
+        logger.print_report_line(manifest_path, "valid")

dfetch/log.py

@@ -48,25 +48,39 @@ def configure_root_logger(console: Optional[Console] = None) -> None:
 class DLogger(logging.Logger):
     """Logging class extended with specific log items for dfetch."""
 
-    def print_info_line(self, name: str, info: str) -> None:
-        """Print a line of info."""
+    _printed_projects: set[str] = set()
+
+    def print_report_line(self, name: str, info: str) -> None:
+        """Print a line for a report."""
         self.info(
             f"  [bold][bright_green]{name:20s}:[/bright_green][blue] {info}[/blue][/bold]"
         )
 
+    def print_info_line(self, name: str, info: str) -> None:
+        """Print a line of info, only printing the project name once."""
+        if name not in DLogger._printed_projects:
+            self.info(f"  [bold][bright_green]{name}:[/bright_green][/bold]")
+            DLogger._printed_projects.add(name)
+
+        line = info.replace("\n", "\n    ")
+        self.info(f"  [bold blue]> {line}[/bold blue]")
+
     def print_warning_line(self, name: str, info: str) -> None:
         """Print a warning line: green name, yellow value."""
-        self.warning(
-            f"  [bold][bright_green]{name:20s}:[/bright_green][bright_yellow] {info}[/bright_yellow][/bold]"
-        )
+        if name not in DLogger._printed_projects:
+            self.info(f"  [bold][bright_green]{name}:[/bright_green][/bold]")
+            DLogger._printed_projects.add(name)
+
+        line = info.replace("\n", "\n    ")
+        self.info(f"  [bold bright_yellow]> {line}[/bold bright_yellow]")
 
     def print_title(self) -> None:
         """Print the DFetch tool title and version."""
         self.info(f"[bold blue]Dfetch ({__version__})[/bold blue]")
 
     def print_info_field(self, field_name: str, field: str) -> None:
         """Print a field with corresponding value."""
-        self.print_info_line(field_name, field if field else "<none>")
+        self.print_report_line(field_name, field if field else "<none>")
 
     def warning(self, msg: object, *args: Any, **kwargs: Any) -> None:
         """Log warning."""
@@ -101,11 +115,33 @@ def status(
             DLogger._printed_projects.add(name)
 
         return Status(
-            f"[bold bright_green]{message}[/bold bright_green]",
+            f"[bold bright_blue]> {message}[/bold bright_blue]",
             spinner=spinner,
             console=rich_console,
         )
 
+    @classmethod
+    def reset_projects(cls) -> None:
+        """Clear the record of printed project names."""
+        cls._printed_projects.clear()
+
+
+class ExtLogFilter(logging.Filter):  # pylint: disable=too-few-public-methods
+    """Adds indentation to all log messages that pass through this filter."""
+
+    def __init__(self, prefix: str = "    "):
+        """Initialize the ExtLogFilter with a prefix."""
+        super().__init__()
+        self.prefix = prefix
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        """Add indentation to the log record message."""
+        color = "blue" if record.levelno < logging.WARNING else "yellow"
+
+        line = record.msg.replace("\n", "\n    ")
+        record.msg = f"{self.prefix}[{color}]{line}[/{color}]"
+        return True
+
 
 def setup_root(name: str, console: Optional[Console] = None) -> DLogger:
     """Create and return the root logger."""
@@ -153,3 +189,4 @@ def configure_external_logger(name: str, level: int = logging.INFO) -> None:
     logger.setLevel(level)
     logger.propagate = True
     logger.handlers.clear()
+    logger.addFilter(ExtLogFilter())

dfetch/project/subproject.py

@@ -156,8 +156,15 @@ def _apply_patches(self) -> list[str]:
 
             normalized_patch_path = str(relative_patch_path.as_posix())
 
-            apply_patch(normalized_patch_path, root=self.local_path)
-            self._log_project(f'Applied patch "{normalized_patch_path}"')
+            self._log_project(f'Applying patch "{normalized_patch_path}"')
+            result = apply_patch(normalized_patch_path, root=self.local_path)
+
+            if result.encoding_warning:
+                self._log_project(
+                    f'After retrying found that patch-file "{normalized_patch_path}" '
+                    "is not UTF-8 encoded, consider saving it with UTF-8 encoding."
+                )
+
             applied_patches.append(normalized_patch_path)
         return applied_patches
 
@@ -223,7 +230,7 @@ def _log_project(self, msg: str) -> None:
 
     @staticmethod
     def _log_tool(name: str, msg: str) -> None:
-        logger.print_info_line(name, msg.strip())
+        logger.print_report_line(name, msg.strip())
 
     @property
     def local_path(self) -> str:
@@ -293,9 +300,10 @@ def on_disk_version(self) -> Optional[Version]:
         try:
             return Metadata.from_file(self.__metadata.path).version
         except TypeError:
-            logger.warning(
+            logger.print_warning_line(
+                self.__project.name,
                 f"{pathlib.Path(self.__metadata.path).relative_to(os.getcwd()).as_posix()}"
-                " is an invalid metadata file, not checking on disk version!"
+                " is an invalid metadata file, not checking on disk version!",
             )
             return None
 
@@ -311,9 +319,10 @@ def _on_disk_hash(self) -> Optional[str]:
         try:
             return Metadata.from_file(self.__metadata.path).hash
         except TypeError:
-            logger.warning(
+            logger.print_warning_line(
+                self.__project.name,
                 f"{pathlib.Path(self.__metadata.path).relative_to(os.getcwd()).as_posix()}"
-                " is an invalid metadata file, not checking local hash!"
+                " is an invalid metadata file, not checking local hash!",
             )
             return None
 

dfetch/vcs/patch.py

@@ -4,17 +4,23 @@
 import hashlib
 import stat
 from collections.abc import Sequence
+from dataclasses import dataclass
 from pathlib import Path
 
 import patch_ng
 
-from dfetch.log import configure_external_logger, get_logger
-
-logger = get_logger(__name__)
+from dfetch.log import configure_external_logger
 
 configure_external_logger("patch_ng")
 
 
+@dataclass
+class PatchResult:
+    """Result of applying a patch."""
+
+    encoding_warning: bool = False
+
+
 def _git_mode(path: Path) -> str:
     if path.is_symlink():
         return "120000"
@@ -61,26 +67,30 @@ def dump_patch(patch_set: patch_ng.PatchSet) -> str:
     return "\n".join(patch_lines) + "\n" if patch_lines else ""
 
 
-def apply_patch(patch_path: str, root: str = ".") -> None:
+def apply_patch(
+    patch_path: str,
+    root: str = ".",
+) -> PatchResult:
     """Apply the specified patch relative to the root."""
     patch_set = patch_ng.fromfile(patch_path)
 
+    result = PatchResult()
+
     if not patch_set:
         with open(patch_path, "rb") as patch_file:
             patch_text = patch_ng.decode_text(patch_file.read()).encode("utf-8")
             patch_set = patch_ng.fromstring(patch_text)
 
             if patch_set:
-                logger.warning(
-                    f'After retrying found that patch-file "{patch_path}" '
-                    "is not UTF-8 encoded, consider saving it with UTF-8 encoding."
-                )
+                result.encoding_warning = True
 
     if not patch_set:
         raise RuntimeError(f'Invalid patch file: "{patch_path}"')
     if not patch_set.apply(strip=0, root=root, fuzz=True):
         raise RuntimeError(f'Applying patch "{patch_path}" failed')
 
+    return result
+
 
 def create_svn_patch_for_new_file(file_path: str) -> str:
     """Create a svn patch for a new file."""

doc/_ext/sphinxcontrib_asciinema/.dfetch_data.yaml

@@ -2,8 +2,8 @@
 # For more info see https://dfetch.rtfd.io/en/latest/getting_started.html
 dfetch:
   branch: master
-  hash: dcd1473e1a3ca613b804e3e51e7ee342
-  last_fetch: 07/01/2026, 21:38:48
+  hash: 5b0a3a18e1e83d363f9eb0ac4b3fca17
+  last_fetch: 26/01/2026, 23:40:59
   patch:
   - doc/_ext/patches/001-autoformat-sphinxcontrib.asciinema.patch
   - doc/_ext/patches/002-fix-options-sphinxcontrib.asciinema.patch

features/check-git-repo.feature

@@ -27,8 +27,10 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              ext/test-repo-rev-only: wanted (e1fda19a57b873eb8e6ae37780594cbb77b70f1a), available (e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
-              ext/test-rev-and-branch: wanted (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
+              ext/test-repo-rev-only:
+              > wanted (e1fda19a57b873eb8e6ae37780594cbb77b70f1a), available (e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
+              ext/test-rev-and-branch:
+              > wanted (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
             """
 
     Scenario: A newer tag is available than in manifest
@@ -51,7 +53,8 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              ext/test-repo-tag-v1: wanted (v1), available (v2.0)
+              ext/test-repo-tag-v1:
+              > wanted (v1), available (v2.0)
             """
 
    Scenario: Check is done after an update
@@ -80,8 +83,10 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              ext/test-repo-rev-only: up-to-date (e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
-              ext/test-rev-and-branch: wanted & current (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
+              ext/test-repo-rev-only:
+              > up-to-date (e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
+              ext/test-rev-and-branch:
+              > wanted & current (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
             """
 
     Scenario: Tag is updated in manifest
@@ -112,7 +117,8 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              ext/test-repo-tag   : wanted (v2.0), current (v1), available (v2.0)
+              ext/test-repo-tag:
+              > wanted (v2.0), current (v1), available (v2.0)
             """
 
     Scenario: A local change is reported
@@ -133,8 +139,9 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              SomeProject         : Local changes were detected, please generate a patch using 'dfetch diff SomeProject' and add it to your manifest using 'patch:'. Alternatively overwrite the local changes with 'dfetch update --force SomeProject'
-              SomeProject         : up-to-date (master - 90be799b58b10971691715bdc751fbe5237848a0)
+              SomeProject:
+              > Local changes were detected, please generate a patch using 'dfetch diff SomeProject' and add it to your manifest using 'patch:'. Alternatively overwrite the local changes with 'dfetch update --force SomeProject'
+              > up-to-date (master - 90be799b58b10971691715bdc751fbe5237848a0)
             """
 
     Scenario: Change to ignored files are not reported
@@ -153,7 +160,8 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              SomeProject         : up-to-date (master - 90be799b58b10971691715bdc751fbe5237848a0)
+              SomeProject:
+              > up-to-date (master - 90be799b58b10971691715bdc751fbe5237848a0)
             """
 
     Scenario: A non-existent remote is reported
@@ -201,9 +209,12 @@ Feature: Checking dependencies from a git repository
         Then the output shows
             """
             Dfetch (0.11.0)
-              SomeProjectMissingTag: wanted (i-dont-exist), but not available at the upstream.
-              SomeProjectNonExistentBranch: wanted (i-dont-exist), but not available at the upstream.
-              SomeProjectNonExistentRevision: wanted (0123112321234123512361236123712381239123), but not available at the upstream.
+              SomeProjectMissingTag:
+              > wanted (i-dont-exist), but not available at the upstream.
+              SomeProjectNonExistentBranch:
+              > wanted (i-dont-exist), but not available at the upstream.
+              SomeProjectNonExistentRevision:
+              > wanted (0123112321234123512361236123712381239123), but not available at the upstream.
             """
 
     Scenario: Credentials required for remote

features/check-specific-projects.feature

@@ -28,5 +28,6 @@ Feature: Checking specific projects
         Then the output shows
             """
             Dfetch (0.11.0)
-              ext/test-rev-and-branch: wanted (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
+              ext/test-rev-and-branch:
+              > wanted (main - 8df389d0524863b85f484f15a91c5f2c40aefda1), available (main - e1fda19a57b873eb8e6ae37780594cbb77b70f1a)
             """