clan-cli: add git.commit_file() to auto commit files if inside a git

- commit only if inside a git repo
- commit only the specified file and nothing else
- auto-generate commit message if not specified
This commit is contained in:
DavHau
2023-09-21 14:07:54 +02:00
parent 8e157f891f
commit 6a359c0a2f
8 changed files with 131 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ from typing import Any, Optional, Type
from clan_cli.dirs import get_clan_flake_toplevel
from clan_cli.errors import ClanError
from clan_cli.git import commit_file
from clan_cli.machines.folders import machine_settings_file
from clan_cli.nix import nix_eval
@@ -240,6 +241,10 @@ def set_option(
settings_file.parent.mkdir(parents=True, exist_ok=True)
with open(settings_file, "w") as f:
json.dump(new_config, f, indent=2)
if settings_file.resolve().is_relative_to(get_clan_flake_toplevel()):
commit_file(
settings_file, commit_message=f"Set option {option_description}"
)
# takes a (sub)parser and configures it

View File

@@ -7,6 +7,7 @@ from typing import Optional
from fastapi import HTTPException
from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs_source
from clan_cli.git import commit_file
from clan_cli.machines.folders import machine_folder, machine_settings_file
from clan_cli.nix import nix_eval
@@ -36,6 +37,7 @@ def set_config_for_machine(machine_name: str, config: dict) -> None:
settings_path.parent.mkdir(parents=True, exist_ok=True)
with open(settings_path, "w") as f:
json.dump(config, f)
commit_file(settings_path)
def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict: