clan-cli: clan_cli.git -> clan_lib.git

pkgs/clan-cli/clan_cli/facts/generate.py

@@ -9,6 +9,7 @@ from tempfile import TemporaryDirectory
 
 from clan_lib.cmd import RunOpts, run
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 from clan_lib.nix import nix_shell
 
 from clan_cli.completions import (
@@ -16,7 +17,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_services_for_machine,
 )
-from clan_cli.git import commit_files
 from clan_cli.machines.list import list_machines
 from clan_cli.machines.machines import Machine
 

pkgs/clan-cli/clan_cli/inventory/__init__.py

@@ -18,6 +18,7 @@ from typing import Any
 from clan_lib.api import API
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.git import commit_file
 from clan_lib.nix_models.inventory import Inventory
 from clan_lib.persist.inventory_store import WriteInfo
 from clan_lib.persist.util import (
@@ -27,8 +28,6 @@ from clan_lib.persist.util import (
     determine_writeability,
 )
 
-from clan_cli.git import commit_file
-
 
 def get_inventory_path(flake: Flake) -> Path:
     """

pkgs/clan-cli/clan_cli/machines/create.py

@@ -8,6 +8,7 @@ from clan_lib.api import API
 from clan_lib.dirs import get_clan_flake_toplevel_or_env
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.git import commit_file
 from clan_lib.nix_models.inventory import (
     Machine as InventoryMachine,
 )
@@ -18,7 +19,6 @@ from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import apply_patch
 
 from clan_cli.completions import add_dynamic_completer, complete_tags
-from clan_cli.git import commit_file
 from clan_cli.machines.list import list_machines
 from clan_cli.templates import (
     InputPrio,

pkgs/clan-cli/clan_cli/machines/hardware.py

@@ -9,10 +9,10 @@ from clan_lib.api import API
 from clan_lib.cmd import RunOpts, run
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.errors import ClanCmdError, ClanError
+from clan_lib.git import commit_file
 from clan_lib.nix import nix_config, nix_eval
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.git import commit_file
 from clan_cli.machines.machines import Machine
 
 from .types import machine_name_type

pkgs/clan-cli/clan_cli/secrets/groups.py

@@ -4,6 +4,7 @@ from collections.abc import Callable
 from pathlib import Path
 
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 
 from clan_cli.completions import (
     add_dynamic_completer,
@@ -12,7 +13,6 @@ from clan_cli.completions import (
     complete_secrets,
     complete_users,
 )
-from clan_cli.git import commit_files
 from clan_cli.machines.types import machine_name_type, validate_hostname
 
 from . import secrets

pkgs/clan-cli/clan_cli/secrets/key.py

@@ -4,8 +4,7 @@ import logging
 import sys
 
 from clan_lib.errors import ClanError
-
+from clan_lib.git import commit_files
-from clan_cli.git import commit_files
 
 from . import sops
 from .secrets import update_secrets

pkgs/clan-cli/clan_cli/secrets/machines.py

@@ -2,13 +2,13 @@ import argparse
 from pathlib import Path
 
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
     complete_secrets,
 )
-from clan_cli.git import commit_files
 from clan_cli.machines.types import machine_name_type, validate_hostname
 
 from . import secrets, sops

pkgs/clan-cli/clan_cli/secrets/secrets.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from typing import IO
 
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 
 from clan_cli.completions import (
     add_dynamic_completer,
@@ -18,7 +19,6 @@ from clan_cli.completions import (
     complete_secrets,
     complete_users,
 )
-from clan_cli.git import commit_files
 
 from . import sops
 from .folders import (

pkgs/clan-cli/clan_cli/secrets/users.py

@@ -6,9 +6,9 @@ from collections.abc import Iterable
 from pathlib import Path
 
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 
 from clan_cli.completions import add_dynamic_completer, complete_secrets, complete_users
-from clan_cli.git import commit_files
 
 from . import groups, secrets, sops
 from .filters import get_secrets_filter_for_user

pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from clan_cli.git import commit_file
 from clan_cli.locked_open import locked_open
 from clan_cli.templates import (
     ClanExports,
@@ -19,6 +18,7 @@ from clan_cli.templates import (
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_lib.cmd import run
 from clan_lib.flake import Flake
+from clan_lib.git import commit_file
 from clan_lib.nix import nix_command
 
 

pkgs/clan-cli/clan_cli/tests/test_git.py

@@ -3,7 +3,7 @@ import tempfile
 from pathlib import Path
 
 import pytest
-from clan_cli import git
+from clan_lib import git
 from clan_lib.errors import ClanError
 
 

pkgs/clan-cli/clan_cli/vars/generate.py

@@ -14,7 +14,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_services_for_machine,
 )
-from clan_cli.git import commit_files
 from clan_cli.machines.list import list_machines
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.migration import check_can_migrate, migrate_files
@@ -22,6 +21,7 @@ from clan_lib.api import API
 from clan_lib.cmd import RunOpts, run
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.git import commit_files
 from clan_lib.nix import nix_config, nix_shell, nix_test_store
 
 from .check import check_vars

pkgs/clan-cli/clan_cli/vars/migration.py

@@ -2,8 +2,8 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from clan_cli.git import commit_files
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_files
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/vars/set.py

@@ -3,11 +3,11 @@ import logging
 import sys
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.git import commit_files
 from clan_cli.machines.machines import Machine
 from clan_cli.vars.get import get_var
 from clan_cli.vars.prompt import PromptType
 from clan_lib.flake import Flake
+from clan_lib.git import commit_files
 
 from .generate import Var
 from .prompt import ask

pkgs/clan-cli/clan_lib/api/disk.py

@@ -5,7 +5,6 @@ from dataclasses import dataclass
 from typing import Any, TypedDict
 from uuid import uuid4
 
-from clan_cli.git import commit_file
 from clan_cli.machines.hardware import HardwareConfig, show_machine_hardware_config
 from clan_cli.machines.machines import Machine
 
@@ -13,6 +12,7 @@ from clan_lib.api import API
 from clan_lib.api.modules import Frontmatter, extract_frontmatter
 from clan_lib.dirs import TemplateType, clan_templates
 from clan_lib.errors import ClanError
+from clan_lib.git import commit_file
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_lib/git/__init__.py

@@ -1,12 +1,12 @@
 import os
 from pathlib import Path
 
+from clan_cli.locked_open import locked_open
+
 from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.errors import ClanError
 from clan_lib.nix import nix_shell
 
-from .locked_open import locked_open
-
 
 def commit_file(
     file_path: Path,

pkgs/clan-cli/clan_lib/persist/inventory_store.py

@@ -1,10 +1,9 @@
 import json
 from dataclasses import dataclass
 
-from clan_cli.git import commit_file
-
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.git import commit_file
 from clan_lib.nix_models.inventory import Inventory
 
 from .util import (