Reduce steps needed to reset workspace #860
Conversation
| const response = await getWarningResponse( | ||
| 'Are you sure you want to discard ALL workspace changes?\n' + | ||
| 'This is IRREVERSIBLE!\n' + | ||
| 'Your current working set will be FOREVER LOST if you proceed.', |
There was a problem hiding this comment.
[F] This pretty much matches what the git extension throws up. You can see a comparison in the first demo.
| expect(mockGitReset).to.be.calledWith({ | ||
| args: ['clean', '-f', '-d', '-q'], | ||
| cwd: dvcDemoPath, | ||
| executable: 'git' |
There was a problem hiding this comment.
[F] Definitely do not want to be calling these actions in tests
| executable: 'git' | ||
| }) | ||
| await executeProcess({ | ||
| args: ['clean', '-f', '-d', '-q'], |
There was a problem hiding this comment.
[F] We need this to remove untracked from the workspace.
There was a problem hiding this comment.
this mirrors what the git extension does
| "when": "scmProvider == dvc && dvc.commands.available == true" | ||
| }, | ||
| { | ||
| "command": "dvc.checkout", |
There was a problem hiding this comment.
[F] This now goes into a new context menu which we can build on.
|
I'll admit on first read I found it a little scary how nuclear this is, but it seems like a totally viable workflow that users will appreciate, and considering the Git extension does something similar we should be in the clear. |
… update-checkout-action
|
Code Climate has analyzed commit d60e25a and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (85% is the threshold). This pull request will bring the total coverage in the repository to 96.5% (0.0% change). View more on Code Climate. |
This PR introduces a
Reset the Workspacecommand in place of what wasCheckoutat the root of each SCM view. This command goes further than the previous one by first runninggit reset --hard HEAD&git clean -f -d -qto remove all of the current git changes in the workspace, it then runsdvc checkoutto clear out any remaining difference betweenHEADand what is in the workspace. The user will not have to understand / hold this concept in their head, they just go back to a clean workspace. LMK what you think on this one.Demo:
Screen.Recording.2021-09-30.at.12.43.33.pm.mov
Screen.Recording.2021-09-30.at.1.10.55.pm.mov
Note: I have a strong feeling that we should make this command available from the command palette which means I will have to introduce a
Repositoriesclass which will look a lot like theExperimentsone.Relates to #609