Tatsh / deltona / 25021808050

100%

push

github

git: add merge-pre-commit-prs and refactor bot merge core

Add a new `merge-pre-commit-prs` CLI command for merging PRs opened
by `pre-commit-ci[bot]`. It mirrors `merge-dependabot-prs` exactly:
same options (`--base-url`, `--delay`, `--concurrency`,
`-M`/`--max-concurrent-http-requests`, `-r`/`--repo`, `-u`), same
retry-on-failure loop, same concurrency model. The repository
discovery check looks for a top-level `.pre-commit-config.yaml` (the
analogue of dependabot's `.github/workflows/dependabot.yml` /
security_and_analysis check). When a merge attempt fails, the
command posts `pre-commit.ci autofix` on the PR — the analogue of
`@dependabot recreate` — deduped against the latest comment.

Refactor the merge implementation around a private
`_merge_bot_pull_requests` core that takes the four pieces that vary
between bots: `bot_login`, `uses_bot` config check, `error_class`,
and `recreate_command`. `merge_dependabot_pull_requests` and
`merge_pre_commit_ci_pull_requests` are now thin wrappers over it,
and the helper functions (`_has_recreate_comment`,
`_post_recreate_comment`, `_list_bot_pull_numbers`, `_merge_bot_pull`)
are no longer dependabot-specific.

Add a new `BotMergeError` base class carrying `remaining` and a
human-readable `bot_label`. `DependabotMergeError` is now a subclass
and keeps its single-arg constructor for backward compatibility; the
new `PreCommitCIMergeError` follows the same pattern. The CLI's
retry loop reads `e.bot_label` for the user-facing prefix, so the
"Repositories with remaining …" message adapts automatically.

Register the script in `pyproject.toml` and `.wiswa.jsonnet` so the
next Wiswa regen is idempotent, and in the lazy CLI registry.

Signed-off-by: Andrew Udvare <audvare@gmail.com>

396 of 396 branches covered (100.0%)

Branch coverage included in aggregate %.

69 of 69 new or added lines in 2 files covered. (100.0%)

3328 of 3328 relevant lines covered (100.0%)

5.0 hits per line