from __future__ import annotations from ..core import config, git_api, hooks, output def _bugfix_branch_name(name: str) -> str: return f"{config.CONFIG.bugfix_prefix}{name}" def handle_bugfix_start(args) -> int: name: str = args.name cfg = config.CONFIG try: git_api.ensure_clean_working_tree() git_api.fetch_remote(cfg.remote_name) git_api.ensure_not_behind_remote(cfg.develop_branch, cfg.remote_name) branch_name = _bugfix_branch_name(name) output.info(f"Aanmaken van bugfix branch '{branch_name}' vanaf '{cfg.develop_branch}'") git_api.create_branch(branch_name, cfg.develop_branch) output.success(f"Bugfix branch '{branch_name}' is aangemaakt en gecheckt out.") # Hooks na succesvol aanmaken van een bugfix branch hooks.run_hooks( "bugfix_start", { "branch": branch_name, "base_branch": cfg.develop_branch, }, ) return 0 except git_api.GitError as exc: output.error(str(exc)) return 1 def handle_bugfix_finish(args) -> int: cfg = config.CONFIG name: str | None = args.name try: git_api.ensure_clean_working_tree() git_api.fetch_remote(cfg.remote_name) if name is None: current = git_api.get_current_branch() if current.startswith(cfg.bugfix_prefix): bugfix_branch = current else: branches = git_api.list_local_branches_with_prefix(cfg.bugfix_prefix) if not branches: raise git_api.GitError( "Er zijn geen lokale bugfix branches gevonden. " "Maak eerst een bugfix branch aan of geef een naam op." ) output.heading("Beschikbare bugfix branches") for b in branches: output.plain(f"- {b}") raise git_api.GitError( "Je zit niet op een bugfix branch. Kies een van de bovenstaande namen " "en voer het commando opnieuw uit, bv.: gitflow bugfix finish ." ) else: bugfix_branch = _bugfix_branch_name(name) git_api.ensure_not_behind_remote(bugfix_branch, cfg.remote_name) git_api.ensure_not_behind_remote(cfg.develop_branch, cfg.remote_name) output.info(f"Mergen van '{bugfix_branch}' naar '{cfg.develop_branch}'") git_api.checkout_branch(cfg.develop_branch) merge_args = ["merge"] if cfg.use_no_ff_for_feature: merge_args.append("--no-ff") merge_args.append(bugfix_branch) try: git_api._run_git(merge_args) # type: ignore[attr-defined] except git_api.GitError as exc: raise git_api.GitError( "Merge is mislukt (mogelijk conflicten). Los de conflicten op en voltooi de merge handmatig." ) from exc output.success(f"Bugfix branch '{bugfix_branch}' is gemerged naar '{cfg.develop_branch}'.") # Optionele cleanup if cfg.delete_bugfix_after_finish: output.info(f"Opruimen van lokale bugfix branch '{bugfix_branch}'") try: git_api._run_git(["branch", "-d", bugfix_branch]) # type: ignore[attr-defined] except git_api.GitError as exc: output.warning(f"Kon bugfix branch '{bugfix_branch}' niet verwijderen: {exc}") # Hooks na succesvolle bugfix-finish hooks.run_hooks( "bugfix_finish", { "branch": bugfix_branch, "base_branch": cfg.develop_branch, }, ) return 0 except git_api.GitError as exc: output.error(str(exc)) return 1