]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
script/ptl-tool: introduce interactive backport parity and conflict verification
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 30 Apr 2026 18:36:30 +0000 (11:36 -0700)
committerPatrick Donnelly <pdonnell@ibm.com>
Mon, 11 May 2026 12:23:25 +0000 (08:23 -0400)
commit922f0c62f5e3cb7a45c0fd1130389da78dbb712f
treeab69d84754346f358f60b99ce2ba766faf6d2bf4
parent2eedf1dcbc261f53180c589db56b86ddae2741a7
script/ptl-tool: introduce interactive backport parity and conflict verification

This patch significantly expands `ptl-tool.py` to automate and improve the
backport review process. It adds robust interactive checks to verify that all
commits from an original PR are correctly represented in a backport PR.

Key additions:

* Commit Parity Verification: Analyzes the local Git DAG to ensure all
  cherry-picked commits map properly to the original main PRs, generating a
  visual map of the commits.

* Conflict Simulation: Creates temporary, detached worktrees to dry-run the
  cherry-pick sequence, verifying conflict resolutions dynamically.

* Automated GitHub Reviews: Enables maintainers to open an editor, preview
  markdown drafts, and post `REQUEST_CHANGES` reviews detailing missing commits
  or backport deviations directly to the pull request.

* Interactive Diffing: Provides file-specific 3-pane patch comparisons
  (range-diffs, original patch, backport patch) within the terminal editor during
  conflict investigations.

* New CLI Flags: Introduces `--audit`, `--always-fetch`,
  `--skip-conflict-check`, and `--release-merge` for greater control over the
  script's behavior.

Assisted-by: Gemini
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/script/ptl-tool.py