Improve git:cherry-pick-by-patch command

[mpatlasov]

Let AI to apply changes manually for conflicted files. See commit description for details.

Summary by CodeRabbit

• Bug Fixes
  • Improved patch application error handling: when a patch fails to apply cleanly, the system now detects conflicted files and attempts manual conflict resolution.
  • Affected filenames are reported for transparency; the operation only fails if required manual changes cannot be applied.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mpatlasov
Once this PR has been reviewed and has the lgtm label, please assign stleerh for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[coderabbitai]

Note

.coderabbit.yaml has unrecognized properties

CodeRabbit is using all valid settings from your configuration. Unrecognized properties (listed below) have been ignored and may indicate typos or deprecated fields that can be removed.

⚠️ Parsing warnings (1)

Validation error: Unrecognized key(s) in object: 'tools'

⚙️ Configuration instructions

• Please see the configuration documentation for more information.
• You can also validate your configuration using the online YAML validator.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Walkthrough

The cherry-pick-by-patch command's error handling is changed: when patch application exits non-zero, the process detects conflicted files, attempts to apply required changes manually, prints affected filenames, and fails only if manual application is not possible.

Changes

Cohort / File(s)	Summary
Manual conflict handling for patch application plugins/git/commands/cherry-pick-by-patch.md	Changes error handling when patch application exits non-zero: adds detection of conflicted files from patch output, attempts manual application of required changes for those files, prints the filenames that require manual changes, and fails the workload only if no manual changes can be applied.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant System as cherry-pick-by-patch
    participant Patch as git show | patch
    participant FileOps as ManualApply

    User->>System: Run cherry-pick-by-patch
    System->>Patch: Apply patch (git show | patch)

    alt Patch Success (exit 0)
        Patch-->>System: Success
        System-->>User: Complete
    else Patch Failure (exit ≠ 0)
        Patch-->>System: Failure + output

        rect rgb(230,240,255)
        Note over System: Conflict resolution path
        System->>System: Parse patch output for conflicted files
        System->>FileOps: Attempt manual application for each conflicted file

        alt Manual application succeeded for at least one file
            FileOps-->>System: Applied changes (list files)
            System-->>User: Complete (manual changes applied)
        else Manual application not possible
            FileOps-->>System: No manual changes possible
            System-->>User: Fail workload
        end
        end
    end

Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

• Review focus areas:
  • Accuracy of conflict detection parsing from patch output (plugins/git/commands/cherry-pick-by-patch.md)
  • Correctness and safety of manual application logic for conflicted files
  • Clarity of documented control flow and failure conditions

Pre-merge checks and finishing touches

Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 inconclusive)

Check name	Status	Explanation	Resolution
No Real People Names In Style References	❓ Inconclusive	Unable to access repository contents to verify if real people names appear in style references within modified files.	Provide direct access to modified files, particularly cherry-pick-by-patch.md and related documentation, to verify compliance with the no real people names policy.

✅ Passed checks (6 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change—improving the git cherry-pick-by-patch command's error handling with manual conflict resolution capabilities.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
No Assumed Git Remote Names	✅ Passed	Comprehensive search found no hardcoded git remote names like 'origin' or 'upstream' in tracked files.
Git Push Safety Rules	✅ Passed	Comprehensive repository search found no git push commands in any files. PR changes to cherry-pick-by-patch command do not introduce push operations.
No Untrusted Mcp Servers	✅ Passed	No MCP server installations or untrusted package dependencies were found in the repository or pull request changes.

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

📜 Recent review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between 0a7eb8a and c3105f7.

📒 Files selected for processing (1)

• plugins/git/commands/cherry-pick-by-patch.md (1 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

• plugins/git/commands/cherry-pick-by-patch.md

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci]

Hi @mpatlasov. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.