fix-cherrypick-robot-pr

Name

git:fix-cherrypick-robot-pr

Synopsis

/git:fix-cherrypick-robot-pr <pr-url> [error-messages]

Description

The git:fix-cherrypick-robot-pr command replaces a cherrypick-robot PR with a clean, manually-crafted cherry-pick PR that includes fixes the robot cannot handle.

The cherrypick-robot creates automated PRs but cannot:

• Fix verification failures (JSON validation, missing annotations)
• Resolve merge conflicts
• Add context-specific fixes
• Handle edge cases requiring human judgment
• Apply repository-specific cleanup

This command helps you create a replacement PR with all necessary fixes applied.

Implementation

1. Extract Information from the Robot PR

Use gh pr view <pr-url> to extract:

• Base branch (e.g., release-4.19)
• PR title (to extract bug ID like OCPBUGS-65944)
• All commit hashes included in the PR
• PR number for later closure
• Current PR checks/CI status

Example:

gh pr view <pr-url> --json baseRefName,title,commits,number,statusCheckRollup

2. Analyze Error Messages

Parse the provided error output to identify:

• Root causes (JSON validation, missing annotations, conflicts, etc.)
• Affected files
• Required fixes
• Fix strategy

Error sources (in priority order):

1. User-provided error messages (from command arguments)
2. File path if provided (e.g., /path/to/ci-errors.log)
3. CI failure URL if provided
4. Automatically fetch from PR status checks

3. Discover Git Remotes and Create Branch

# Discover the upstream remote (the main repository)
# Look for a remote that's not owned by the current user
UPSTREAM_REMOTE=$(git remote -v | grep "fetch" | grep -v "$(git config user.name)" | awk '{print $1}' | head -1)

# Discover the fork remote (your fork)
FORK_REMOTE=$(git remote -v | grep "$(git config user.name).*push" | awk '{print $1}' | head -1)

# If not found, fall back to common names
UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream}
FORK_REMOTE=${FORK_REMOTE:-origin}

# Fetch the latest base branch
git fetch $UPSTREAM_REMOTE <base-branch>

# Create new branch following naming convention
git checkout -b cherry-pick-<issue-number>-to-<base-branch> $UPSTREAM_REMOTE/<base-branch>