sourcegit: Editing a commit with an interactive rebase is not properly handled
Steps to reproduce:
- Perform an interactive rebase
- Choose Edit for a commit
- Click on
Start
What that does:
- Good: It does perform an interactive rebase and stops at that commit so that the user can edit it
- Good: There is a banner at the top saying that there is an ongoing rebase
- Bad: The buttons in the banner are
ResolveandAbortas if there was a conflict- There is no conflict to resolve, so the buttons should be
ContinueandAbort - I may be remembering this incorrectly but I think that this used to be handled properly until some weeks ago
- There is no conflict to resolve, so the buttons should be
- Bad: In the
Local Changespage, theAmendcheckbox has disappeared, and theCommitandCommit & Pushbuttons are replaced by aContinuebutton and a menu with the optionCommit (edit)- Editing is supposed to be like working on a branch, except that you cannot rebase because there is already a rebase going on. Some example of its uses: amending the edited commit, creating a new commit after the edited one, splitting the edited commit (and maybe also some before it) by resetting to an older commit then creating better commits with those changes. Then once you’re done, you tell the rebase to continue so that it applies the later commits on top of the changes
- For that reason, the page should be as usual, allowing the user to stage/commit/amend
- That being said, removing the
Commit & Pushbutton does make sense because pushing during a rebase is an error (although you could keep it and let the user deal with the error message), and renaming theCommitbutton toCommit (edit)is not a bad idea
About this issue
- Original URL
- State: closed
- Created 2 years ago
- Reactions: 1
- Comments: 19
Commits related to this issue
- enhance: redesign in-progress banner (#790) * show head for cherry-pick * show stopped at for rebase * supports `--skip` for cherry-pick and rebase — committed to sourcegit-scm/sourcegit by love-linger 2 years ago
- fix: original `FullMessage` missing line-endings (#790) — committed to sourcegit-scm/sourcegit by love-linger 2 years ago
- fix: wrong whitespace at start of the last commit message while interactive rebasing (#790) — committed to sourcegit-scm/sourcegit by love-linger 2 years ago
- localization: add missing de_DE keys BranchCM.MergeMultiBranches, CommitCM.MergeMultiple, MergeMultiple #793 CommitCM.Merge 2053ce033d1e24e9e6b74cecfcc0761fad899f6f CommitDetail.Files.Search 894f3e9b... — committed to NilsPvR/sourcegit by NilsPvR 2 years ago
- localization: add missing de_DE keys (#817) * localization: add missing de_DE keys BranchCM.MergeMultiBranches, CommitCM.MergeMultiple, MergeMultiple #793 CommitCM.Merge 2053ce033d1e24e9e6b74cecf... — committed to sourcegit-scm/sourcegit by NilsPvR 2 years ago
If your whitespace is in start of subject or endof description, it will be trimmed. Otherwise, all the content will be writed into a temp file, then SourceGit will call
git commit --file="TMP_MSG_FILE" <other params>to finish commitMost of the error messages are reading from
Process.ErrorDataReceivedevent handler, which will triggerer when there is a new line receviced fromstderr, and if it is an empty string (blank line),SourceGitwill just ignore it.The
Trim()in 59f11e9acaf5edbf6dad64565dd550e031f4aa67 and 6eb226eb4492d2fe6a05fb3162da0f782d3f5fc1 is only used for reading and displaying commit message (not writing).Fixed. You can download the latest CI build from Github Action.
I’ve pushed some modifications to
develop.cherry-pickrebaseSKIPbutton forcherry-pickandrebase--continuebutton?Local Changes, how do we let users know which file has conflicts? Or is theLocal Changespage not the right page user editing commits?interactive rebase, if you choose multiple commits withedit, and when the rebasing goes to one of them, it will stop and wait for user editing the current one. If we do NOT take users to theLOCAL CHANGES, how do we let users known which commit is current processing? BTW, in this condition, thecontinuebutton is enabled because there’s no conflicts.