196f55c58e
This commit enhances the behaviour of pull_with_verification() and adds a
comprehensive unit test suite covering all control flows.
Changes:
- Added `preview` parameter to fully disable interaction and execution.
- Improved verification logic:
* Prompt only when not in preview, verification is enabled,
verification info exists, and verification failed.
* Skip prompts entirely when --no-verification is set.
- More explicit construction of `git pull` command with optional extra args.
- Improved messaging and formatting for clarity.
- Ensured directory existence is checked before any verification logic.
- Added detailed comments explaining logic and conditions.
Tests:
- New file tests/unit/pkgmgr/actions/repos/test_pull_with_verification.py
- Covers:
* Preview mode (no input, no subprocess)
* Verification failure – user rejects
* Verification failure – user accepts
* Verification success – immediate git call
* Missing repository directory – skip silently
* --no-verification flag bypasses prompts
* Command formatting with extra args
- Uses systematic mocking for identifier, repo-dir, verify_repository(),
subprocess.run(), and user input.
This significantly strengthens correctness, UX, and test coverage of the
repository pull workflow.
https://chatgpt.com/share/69384aaa-0c80-800f-b4b4-64e6fbdebd3b
78 lines
2.7 KiB
Python
78 lines
2.7 KiB
Python
import os
|
|
import subprocess
|
|
import sys
|
|
|
|
from pkgmgr.core.repository.identifier import get_repo_identifier
|
|
from pkgmgr.core.repository.dir import get_repo_dir
|
|
from pkgmgr.core.repository.verify import verify_repository
|
|
|
|
|
|
def pull_with_verification(
|
|
selected_repos,
|
|
repositories_base_dir,
|
|
all_repos,
|
|
extra_args,
|
|
no_verification,
|
|
preview: bool,
|
|
) -> None:
|
|
"""
|
|
Execute `git pull` for each repository with verification.
|
|
|
|
- Uses verify_repository() in "pull" mode.
|
|
- If verification fails (and verification info is set) and
|
|
--no-verification is not enabled, the user is prompted to confirm
|
|
the pull.
|
|
- In preview mode, no interactive prompts are performed and no
|
|
Git commands are executed; only the would-be command is printed.
|
|
"""
|
|
for repo in selected_repos:
|
|
repo_identifier = get_repo_identifier(repo, all_repos)
|
|
repo_dir = get_repo_dir(repositories_base_dir, repo)
|
|
|
|
if not os.path.exists(repo_dir):
|
|
print(f"Repository directory '{repo_dir}' not found for {repo_identifier}.")
|
|
continue
|
|
|
|
verified_info = repo.get("verified")
|
|
verified_ok, errors, commit_hash, signing_key = verify_repository(
|
|
repo,
|
|
repo_dir,
|
|
mode="pull",
|
|
no_verification=no_verification,
|
|
)
|
|
|
|
# Only prompt the user if:
|
|
# - we are NOT in preview mode
|
|
# - verification is enabled
|
|
# - the repo has verification info configured
|
|
# - verification failed
|
|
if (
|
|
not preview
|
|
and not no_verification
|
|
and verified_info
|
|
and not verified_ok
|
|
):
|
|
print(f"Warning: Verification failed for {repo_identifier}:")
|
|
for err in errors:
|
|
print(f" - {err}")
|
|
choice = input("Proceed with 'git pull'? (y/N): ").strip().lower()
|
|
if choice != "y":
|
|
continue
|
|
|
|
# Build the git pull command (include extra args if present)
|
|
args_part = " ".join(extra_args) if extra_args else ""
|
|
full_cmd = f"git pull{(' ' + args_part) if args_part else ''}"
|
|
|
|
if preview:
|
|
# Preview mode: only show the command, do not execute or prompt.
|
|
print(f"[Preview] In '{repo_dir}': {full_cmd}")
|
|
else:
|
|
print(f"Running in '{repo_dir}': {full_cmd}")
|
|
result = subprocess.run(full_cmd, cwd=repo_dir, shell=True)
|
|
if result.returncode != 0:
|
|
print(
|
|
f"'git pull' for {repo_identifier} failed "
|
|
f"with exit code {result.returncode}."
|
|
)
|
|
sys.exit(result.returncode)
|