ruff: Format with ruff v0.14.3

uv run ruff check --select ALL . --fix --unsafe-fixes --preview --show-fixes; uv run ruff format .

Fixed 72 errors:
- scripts/generate_gitlab.py:
    3 × G004 (logging-f-string)
    1 × PLW1514 (unspecified-encoding)
- src/vcspull/cli/_output.py:
    3 × T201 (print)
    1 × F401 (unused-import)
    1 × COM812 (missing-trailing-comma)
- src/vcspull/cli/add.py:
    1 × RUF052 (used-dummy-variable)
    1 × TC003 (typing-only-standard-library-import)
- src/vcspull/cli/discover.py:
    1 × RUF052 (used-dummy-variable)
    1 × TC003 (typing-only-standard-library-import)
- src/vcspull/cli/list.py:
    2 × COM812 (missing-trailing-comma)
    2 × TC003 (typing-only-standard-library-import)
    1 × I001 (unsorted-imports)
- src/vcspull/cli/status.py:
    6 × COM812 (missing-trailing-comma)
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)
- src/vcspull/cli/sync.py:
    5 × COM812 (missing-trailing-comma)
    1 × F811 (redefined-while-unused)
    1 × T201 (print)
    1 × G004 (logging-f-string)
    1 × F841 (unused-variable)
    1 × FURB177 (implicit-cwd)
    1 × TC004 (runtime-import-in-type-checking-block)
    1 × RET501 (unnecessary-return-none)
    1 × F401 (unused-import)
- src/vcspull/config.py:
    2 × RUF027 (missing-f-string-syntax)
    1 × COM812 (missing-trailing-comma)
- tests/cli/test_add.py:
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)
    1 × PLR5501 (collapsible-else-if)
- tests/cli/test_discover.py:
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)
- tests/cli/test_list.py:
    1 × PLW1514 (unspecified-encoding)
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)
- tests/cli/test_plan_output_helpers.py:
    1 × COM812 (missing-trailing-comma)
- tests/cli/test_status.py:
    3 × TC006 (runtime-cast-value)
    1 × TC003 (typing-only-standard-library-import)
    1 × PLW1514 (unspecified-encoding)
    1 × I001 (unsorted-imports)
    1 × TC001 (typing-only-first-party-import)
- tests/cli/test_sync_plan_helpers.py:
    1 × TC003 (typing-only-standard-library-import)
- tests/test_cli.py:
    5 × COM812 (missing-trailing-comma)
    2 × FLY002 (static-join-to-f-string)
    1 × F811 (redefined-while-unused)
    1 × TC004 (runtime-import-in-type-checking-block)
- tests/test_config.py:
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)
- tests/test_utils.py:
    1 × F811 (redefined-while-unused)
    1 × TC004 (runtime-import-in-type-checking-block)

Found 1025 errors (72 fixed, 953 remaining).
6 files reformatted, 36 files left unchanged

Author: tony

scripts/generate_gitlab.py

@@ -61,14 +61,14 @@
 
         if result != "y":
             log.info(
-                f"Aborting per user request as existing config file ({config_filename})"
-                " should not be overwritten!",
+                "Aborting per user request as existing config file (%s) should not be overwritten!",
+                config_filename,
             )
             sys.exit(0)
 
-    config_file = config_filename.open(mode="w")
+    config_file = config_filename.open(encoding="utf-8", mode="w")
 except OSError:
-    log.info(f"File {config_filename} not accessible")
+    log.info("File %s not accessible", config_filename)
     sys.exit(1)
 
 response = requests.get(
@@ -78,7 +78,7 @@
 )
 
 if response.status_code != 200:
-    log.info(f"Error: {response}")
+    log.info("Error: %s", response)
     sys.exit(1)
 
 path_prefix = pathlib.Path().cwd()

src/vcspull/cli/_output.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import json
 import sys
 import typing as t
 from dataclasses import dataclass, field
@@ -147,7 +146,7 @@ def to_json_object(self) -> dict[str, t.Any]:
                 {
                     "path": workspace_root,
                     "operations": [entry.to_payload() for entry in entries],
-                }
+                },
             )
         return {
             "format_version": "1",
@@ -186,7 +185,6 @@ def emit(self, data: dict[str, t.Any] | PlanEntry | PlanSummary) -> None:
 
         if self.mode == OutputMode.NDJSON:
             # Stream one JSON object per line immediately
-            print(json.dumps(payload), file=sys.stdout)
             sys.stdout.flush()
         elif self.mode == OutputMode.JSON:
             # Buffer for later output as single array
@@ -202,12 +200,11 @@ def emit_text(self, text: str) -> None:
             Text to output
         """
         if self.mode == OutputMode.HUMAN:
-            print(text)
+            pass
 
     def finalize(self) -> None:
         """Finalize output (flush JSON buffer if needed)."""
         if self.mode == OutputMode.JSON and self._json_buffer:
-            print(json.dumps(self._json_buffer, indent=2), file=sys.stdout)
             self._json_buffer.clear()
 
 

src/vcspull/cli/add.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import argparse
 import logging
 import pathlib
 import traceback
@@ -20,6 +19,9 @@
     workspace_root_label,
 )
 
+if t.TYPE_CHECKING:
+    import argparse
+
 log = logging.getLogger(__name__)
 
 
@@ -180,8 +182,8 @@ def add_repo(
         cwd=cwd,
         home=home,
     )
-    raw_config, workspace_map, merge_conflicts, _merge_changes = normalization_result
-    config_was_normalized = _merge_changes > 0
+    raw_config, workspace_map, merge_conflicts, merge_changes = normalization_result
+    config_was_normalized = merge_changes > 0
 
     for message in merge_conflicts:
         log.warning(message)

src/vcspull/cli/discover.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import argparse
 import logging
 import os
 import pathlib
@@ -22,6 +21,9 @@
     workspace_root_label,
 )
 
+if t.TYPE_CHECKING:
+    import argparse
+
 log = logging.getLogger(__name__)
 
 
@@ -222,7 +224,7 @@ def discover_repos(
         cwd=cwd,
         home=home,
     )
-    raw_config, workspace_map, merge_conflicts, _merge_changes = normalization_result
+    raw_config, workspace_map, merge_conflicts, merge_changes = normalization_result
 
     for message in merge_conflicts:
         log.warning(message)
@@ -348,7 +350,7 @@ def discover_repos(
                     Style.RESET_ALL,
                 )
 
-    changes_made = _merge_changes > 0
+    changes_made = merge_changes > 0
 
     if not repos_to_add:
         if existing_repos:

src/vcspull/cli/list.py

@@ -2,9 +2,7 @@
 
 from __future__ import annotations
 
-import argparse
 import logging
-import pathlib
 import typing as t
 
 from vcspull.config import filter_repos, find_config_files, load_configs
@@ -15,6 +13,9 @@
 from ._workspaces import filter_by_workspace
 
 if t.TYPE_CHECKING:
+    import argparse
+    import pathlib
+
     from vcspull.types import ConfigDict
 
 log = logging.getLogger(__name__)
@@ -168,7 +169,7 @@ def _output_flat(
                 "url": str(repo_url),
                 "path": contract_user_home(repo_path),
                 "workspace_root": str(repo.get("workspace_root", "")),
-            }
+            },
         )
 
         # Human output (contract home directory for privacy/brevity)
@@ -219,7 +220,7 @@ def _output_tree(
                     "url": str(repo_url),
                     "path": contract_user_home(repo_path),
                     "workspace_root": workspace,
-                }
+                },
             )
 
             # Human output: indented repo (contract home directory for privacy/brevity)

src/vcspull/cli/status.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import argparse
 import asyncio
 import logging
 import os
@@ -22,6 +21,8 @@
 from ._workspaces import filter_by_workspace
 
 if t.TYPE_CHECKING:
+    import argparse
+
     from vcspull.types import ConfigDict
 
 log = logging.getLogger(__name__)
@@ -84,7 +85,7 @@ def update(self, processed: int, exists: int, missing: int) -> None:
                 f"Progress: {processed}/{self.total}",
                 self._colors.success(f"✓:{exists}"),
                 self._colors.error(f"✗:{missing}"),
-            )
+            ),
         )
         clean_len = _visible_length(line)
         padding = max(self._last_render_len - clean_len, 0)
@@ -204,7 +205,9 @@ async def _check_repos_status_async(
     async def check_with_limit(repo: ConfigDict) -> dict[str, t.Any]:
         async with semaphore:
             return await asyncio.to_thread(
-                check_repo_status, repo, detailed=config.detailed
+                check_repo_status,
+                repo,
+                detailed=config.detailed,
             )
 
     tasks = [asyncio.create_task(check_with_limit(repo)) for repo in repos]
@@ -410,7 +413,9 @@ def status_repos(
 
         progress_enabled = formatter.mode == OutputMode.HUMAN and sys.stdout.isatty()
         progress_printer = StatusProgressPrinter(
-            len(found_repos), colors, progress_enabled
+            len(found_repos),
+            colors,
+            progress_enabled,
         )
 
         start_time = perf_counter()
@@ -419,7 +424,7 @@ def status_repos(
                 found_repos,
                 config=check_config,
                 progress=progress_printer if progress_enabled else None,
-            )
+            ),
         )
         duration_ms = int((perf_counter() - start_time) * 1000)
 
@@ -453,7 +458,7 @@ def status_repos(
             {
                 "reason": "status",
                 **status,
-            }
+            },
         )
 
         # Human output
@@ -541,7 +546,7 @@ def _format_status_line(
 
     if detailed:
         formatter.emit_text(
-            f"  {colors.muted('Path:')} {contract_user_home(status['path'])}"
+            f"  {colors.muted('Path:')} {contract_user_home(status['path'])}",
         )
         branch = status.get("branch")
         if branch:

src/vcspull/cli/sync.py

@@ -4,7 +4,6 @@
 
 import asyncio
 import contextlib
-import json
 import logging
 import os
 import pathlib
@@ -42,7 +41,6 @@
 
 if t.TYPE_CHECKING:
     import argparse
-    import pathlib
 
     from libvcs._internal.types import VCSLiteral
     from libvcs.sync.git import GitSync
@@ -114,7 +112,7 @@ def update(self, summary: PlanSummary, processed: int) -> None:
                 self._colors.muted(f"✓:{summary.unchanged}"),
                 self._colors.warning(f"⚠:{summary.blocked}"),
                 self._colors.error(f"✗:{summary.errors}"),
-            )
+            ),
         )
         clean_len = _visible_length(line)
         padding = max(self._last_render_len - clean_len, 0)
@@ -145,7 +143,7 @@ def _get_repo_path(repo: ConfigDict) -> pathlib.Path:
     """Return the resolved filesystem path for a repository entry."""
     raw_path = repo.get("path")
     if raw_path is None:
-        return pathlib.Path().resolve()
+        return pathlib.Path.cwd()
     return pathlib.Path(str(raw_path)).expanduser()
 
 
@@ -459,7 +457,7 @@ def _render_plan(
                     extra_lines.append(f"url: {entry.url}")
                 if entry.ahead is not None or entry.behind is not None:
                     extra_lines.append(
-                        f"ahead/behind: {entry.ahead or 0}/{entry.behind or 0}"
+                        f"ahead/behind: {entry.ahead or 0}/{entry.behind or 0}",
                     )
                 if entry.error:
                     extra_lines.append(f"error: {entry.error}")
@@ -502,8 +500,7 @@ def _emit_plan_output(
         formatter.emit(plan.summary)
         return
 
-    structured = PlanResult(entries=display_entries, summary=plan.summary)
-    print(json.dumps(structured.to_json_object(), indent=2))
+    PlanResult(entries=display_entries, summary=plan.summary)
 
 
 def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
@@ -679,7 +676,7 @@ def sync(
                 found_repos,
                 config=plan_config,
                 progress=progress_printer if progress_enabled else None,
-            )
+            ),
         )
         plan_result.summary.duration_ms = int((perf_counter() - start_time) * 1000)
         if progress_enabled:
@@ -711,7 +708,7 @@ def sync(
 
         def silent_progress(output: str, timestamp: datetime) -> None:
             """Suppress progress for machine-readable output."""
-            return None
+            return
 
         progress_callback = silent_progress
 
@@ -755,7 +752,8 @@ def silent_progress(output: str, timestamp: datetime) -> None:
             formatter.emit(event)
             if is_human:
                 log.info(
-                    f"Failed syncing {repo_name}",
+                    "Failed syncing %s",
+                    repo_name,
                 )
             if log.isEnabledFor(logging.DEBUG):
                 import traceback
@@ -770,7 +768,7 @@ def silent_progress(output: str, timestamp: datetime) -> None:
                     {
                         "reason": "summary",
                         **summary,
-                    }
+                    },
                 )
                 formatter.finalize()
                 if parser is not None:
@@ -790,7 +788,7 @@ def silent_progress(output: str, timestamp: datetime) -> None:
         {
             "reason": "summary",
             **summary,
-        }
+        },
     )
 
     if formatter.mode == OutputMode.HUMAN:

src/vcspull/config.py

@@ -525,18 +525,18 @@ def normalize_workspace_roots(
                         change_count += 1
                     elif existing_value[repo_name] != repo_config:
                         conflict_message = (
-                            "Workspace root '{label}' contains conflicting definitions "
+                            f"Workspace root '{label}' contains conflicting definitions "
                             "for repository '{repo}'. Keeping the existing entry."
                         )
                         conflicts.append(
                             conflict_message.format(
                                 label=normalized_label,
                                 repo=repo_name,
-                            )
+                            ),
                         )
             elif existing_value != value:
                 conflict_message = (
-                    "Workspace root '{label}' contains conflicting non-dictionary "
+                    f"Workspace root '{label}' contains conflicting non-dictionary "
                     "values. Keeping the existing entry."
                 )
                 conflicts.append(conflict_message.format(label=normalized_label))