Adds an option to delete a worktree along with its branch (GLVSC-637) #3508
+43
−3
Conversation
This file contains hidden or 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
sergeibbb
added a commit
that referenced
this pull request
Sep 2, 2024
sergeibbb
force-pushed
the
feature/GLVSC-637-delete-worktree-and-branch
branch
from
ae0dbe8 to
572ef21
Compare
sergeibbb
added a commit
that referenced
this pull request
Sep 2, 2024
sergeibbb
force-pushed
the
feature/GLVSC-637-delete-worktree-and-branch
branch
from
572ef21 to
7a5d919
Compare
eamodio
reviewed
Sep 3, 2024
src/commands/git/worktree.ts
Outdated
Comment on lines
322
to
339
| const branchesOfDeletedWorktrees = yield* this.deleteCommandSteps( | ||
| state as DeleteStepState, | ||
| context, | ||
| ); | ||
| if (branchesOfDeletedWorktrees !== StepResultBreak && branchesOfDeletedWorktrees?.length) { | ||
| yield* getSteps( | ||
| this.container, | ||
| { | ||
| command: 'branch', | ||
| state: { | ||
| subcommand: 'delete', | ||
| repo: state.repo, | ||
| references: branchesOfDeletedWorktrees, | ||
| }, | ||
| }, | ||
| this.pickedVia, | ||
| ); | ||
| } |
There was a problem hiding this comment.
Could we move this into this.deleteCommandSteps? I tried it locally and it seems fine.
eamodio
reviewed
Sep 3, 2024
axosoft-ramint
approved these changes
Sep 3, 2024
There was a problem hiding this comment.
I don't have much context into this, and I'm not sure how many ways it can break, so I was only able to test easy/happy flows.
I think this is fine as it stands, but in the future, I think we can improve it by waiting to complete any action until all choices are made. I.e. if I choose "delete worktree and branch", do not delete the worktree until I have confirmed my "delete branch" choice in the next step.
|
@sergeibbb You have conflicts in the CHANGELOG file. Once those are addressed we can merge. |
sergeibbb
force-pushed
the
feature/GLVSC-637-delete-worktree-and-branch
branch
from
7a5d919 to
c029552
Compare
- Avoids potential issues with backing up steps
eamodio
pushed a commit
that referenced
this pull request
Sep 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Adds 2 new options to delete the branch as part of the worktree delete.
Which will after the completion of the worktree(s) delete, will start the delete branch(es) flow (at it confirmation step – which will naturally happen if all the context is provided to that flow)
Checklist
Fixes $XXX -orCloses #XXX -prefix to auto-close the issue that your PR addresses