Function check_commit

contrib/review-prs.py:190–218

Verify some invariants about a commit, and fill in the full parent commid IDs.

(commit, last_reviewed, incoming_commit)

    return merged_commits

def check_commit(commit, last_reviewed, incoming_commit) -> None:
    """Verify some invariants about a commit, and fill in the full parent commid IDs."""

    cid = commit["cid"]
    parents = shell(f"git cat-file -p {cid} | grep '^parent'")
    if len(parents) != 2:
        print(f"WARNING: Expected merge, but commit {cid} has {parents} parents, which is not two! Please hand-review.")
        return

    parent_cids = []
    for p in parents:
        m = re.fullmatch("parent ([0-9a-f]+)", p)
        assert m is not None
        parent_cids.append(m.group(1))

    full_merged_cid = shell_oneline(f"git rev-parse {commit['merged_cid']}")
    if parent_cids[1] != full_merged_cid:
        raise Exception("Merge isn't merging what the commit message claims to be merging")

    if parent_cids[0] != last_reviewed:
        raise Exception("First parent of next commit to review should be last commit reviewed.")

    if full_merged_cid != incoming_commit["cid"]:
        print("WARNING: Merge isn't merging the next expected Bitcoin/Elements commit.")
        print("This could mean something was skipped, or it could just mean that some extra fixup commits were added.")
        print("If the diff looks really wrong, stop here -- some manual review will be required.")

    commit["parent_cid"] = parent_cids[0]
    commit["merged_cid"] = full_merged_cid

def check_or_create_worktree(path) -> None:
    """Verify that a git worktree (or repo) exists at `path`. Offer to create it if missing. Exit if something is wrong."""