ruff: Format with ruff v0.14.5

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

Fixed 10 errors:
- src/vcspull/cli/add.py:
    1 × PLR5501 (collapsible-else-if)
- tests/cli/test_add.py:
    2 × COM812 (missing-trailing-comma)
    1 × F811 (redefined-while-unused)
    1 × TC004 (runtime-import-in-type-checking-block)
- tests/cli/test_discover.py:
    1 × F811 (redefined-while-unused)
    1 × TC004 (runtime-import-in-type-checking-block)
- tests/test_config_writer.py:
    1 × TC003 (typing-only-standard-library-import)
- tests/test_utils.py:
    1 × I001 (unsorted-imports)
    1 × TC003 (typing-only-standard-library-import)

Found 1125 errors (10 fixed, 1115 remaining).
2 files reformatted, 46 files left unchanged

Author: tony

src/vcspull/cli/add.py

@@ -463,12 +463,11 @@ def _ensure_workspace_label_for_merge(
                 relabelled = True
             else:
                 config_data.setdefault("./", {})
+        elif existing_label is None:
+            workspace_label = preferred_label
+            config_data.setdefault(workspace_label, {})
         else:
-            if existing_label is None:
-                workspace_label = preferred_label
-                config_data.setdefault(workspace_label, {})
-            else:
-                workspace_label = existing_label
+            workspace_label = existing_label
 
         if workspace_label not in config_data:
             config_data[workspace_label] = {}

tests/cli/test_add.py

@@ -18,8 +18,6 @@
 from vcspull.cli.add import add_repo, create_add_subparser, handle_add_command
 
 if t.TYPE_CHECKING:
-    import pathlib
-
     from _pytest.monkeypatch import MonkeyPatch
     from syrupy.assertion import SnapshotAssertion
 
@@ -753,7 +751,7 @@ def test_handle_add_command_path_mode(
             {
                 "test_id": test_id,
                 "log": normalized_log.replace("<config>", "~/.vcspull.yaml"),
-            }
+            },
         )
     else:
         snapshot.assert_match({"test_id": test_id, "log": normalized_log})
@@ -911,7 +909,7 @@ class NoMergePreservationFixture(t.NamedTuple):
                 repo: git+https://github.com/Stiivi/bubbles.git
               cubes:
                 repo: git+https://github.com/Stiivi/cubes.git
-            """
+            """,
         ),
         expected_original_repos=(
             "Flexget",

tests/cli/test_discover.py

@@ -14,8 +14,6 @@
 from vcspull.cli.discover import ConfigScope, _classify_config_scope, discover_repos
 
 if t.TYPE_CHECKING:
-    import pathlib
-
     from _pytest.monkeypatch import MonkeyPatch
     from syrupy.assertion import SnapshotAssertion
 

tests/test_config_writer.py

@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
-import pathlib
 import textwrap
 import typing as t
 
 import pytest
 
 from vcspull.config import save_config_yaml_with_items
 
+if t.TYPE_CHECKING:
+    import pathlib
+
 FixtureEntry = tuple[str, dict[str, t.Any]]
 
 

tests/test_utils.py

@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-import pathlib
 import typing as t
 
 from vcspull.util import get_config_dir
 
 if t.TYPE_CHECKING:
+    import pathlib
+
     import pytest