Improves "paused" operation (cherry-pick, merge, rebase, revert) status and actions
#3912
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
eamodio
commented
Jan 7, 2025
•
eamodio
commented
- Refactors merge/rebase status into a unified paused operation status
- Adds cherry-pick and revert statuses
- Improves performance of detecting a paused operation
- Adds abort / continue actions & basic error handling
There was a problem hiding this comment.
Copilot reviewed 23 out of 38 changed files in this pull request and generated no comments.
Files not reviewed (15)
- src/git/models/merge.ts: Evaluated as low risk
- src/git/models/rebase.ts: Evaluated as low risk
- src/constants.views.ts: Evaluated as low risk
- src/views/nodes/fileRevisionAsCommitNode.ts: Evaluated as low risk
- src/git/errors.ts: Evaluated as low risk
- src/views/nodes/fileHistoryNode.ts: Evaluated as low risk
- src/views/nodes/branchNode.ts: Evaluated as low risk
- src/views/branchesView.ts: Evaluated as low risk
- src/views/nodes/mergeConflictCurrentChangesNode.ts: Evaluated as low risk
- src/plus/integrations/providers/github/githubGitProvider.ts: Evaluated as low risk
- src/env/node/git/localGitProvider.ts: Evaluated as low risk
- src/trackers/documentTracker.ts: Evaluated as low risk
- src/git/gitProvider.ts: Evaluated as low risk
- src/git/gitProviderService.ts: Evaluated as low risk
- src/views/nodes/abstract/viewNode.ts: Evaluated as low risk
Comments suppressed due to low confidence (2)
src/env/node/git/git.ts:79
- [nitpick] The updated error message for 'changesWouldBeOverwritten' should be reviewed to ensure it is clear and helpful.
changesWouldBeOverwritten: /Your local changes to the following files would be overwritten|Your local changes would be overwritten/i,
src/env/node/git/git.ts:98
- [nitpick] The newly introduced error message for 'noPausedOperation' should be reviewed to ensure it is clear and helpful.
noPausedOperation: /no merge (?:in progress|to abort)|no cherry-pick(?: or revert)? in progress|no rebase in progress/i,
- Unifies into paused operation status - Adds cherry-pick and revert statuses - Improves performance of detecting a paused operation Adds abort & continue actions (wip)
Moves paused operation status strings into utils
eamodio
force-pushed
the
feature/paused-op-status
branch
from
552f0d1 to
ef478e4
Compare
d13
reviewed
Jan 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.