Show todo items for pending cherry-picks and reverts#4442

Merged

stefanhaller merged 9 commits intomasterfrom

show-revert-and-cherry-pick-todos

Apr 20, 2025

Commits on Apr 20, 2025

Remove unused enum entry StatusSelected
stefanhaller
committed
Use commit.IsTODO instead of comparing Status against models.StatusRebasing
stefanhaller
committed
Show original todo action instead of "conflict", and show `<-- CONFLICT` instead
stefanhaller
committed
Simplify the MergeRebasingCommits call in GetCommits (slightly)
stefanhaller
committed
Show todos (and conflicting commit) for cherry-pick and revert
stefanhaller
committed
Add test to check that an "edit" entry correctly shows a conflict
stefanhaller
committed
Add test demonstrating problem with revert (or cherry-pick) during a rebase
stefanhaller
committed
Fix the bug described in the previous commit
stefanhaller
committed
Disallow any changes to commits or todos when cherry-picking or reverting
stefanhaller
committed