Reduce steps needed to reset workspace

extension/package.json

@@ -202,6 +202,12 @@
         "command": "dvc.renameTarget",
         "category": "DVC"
       },
+      {
+        "title": "%command.resetWorkspace%",
+        "command": "dvc.resetWorkspace",
+        "category": "DVC",
+        "icon": "$(discard)"
+      },
       {
         "title": "%command.runExperiment%",
         "command": "dvc.runExperiment",
@@ -395,6 +401,10 @@
           "command": "dvc.renameTarget",
           "when": "false"
         },
+        {
+          "command": "dvc.resetWorkspace",
+          "when": "false"
+        },
         {
           "command": "dvc.runExperiment",
           "when": "dvc.commands.available == true"
@@ -442,23 +452,28 @@
       ],
       "scm/title": [
         {
-          "command": "dvc.checkout",
-          "group": "navigation",
+          "command": "dvc.resetWorkspace",
+          "group": "navigation@1",
           "when": "scmProvider == dvc && dvc.commands.available == true"
         },
         {
           "command": "dvc.commit",
-          "group": "navigation",
+          "group": "navigation@2",
           "when": "scmProvider == dvc && dvc.commands.available == true"
         },
         {
           "command": "dvc.pull",
-          "group": "navigation",
+          "group": "navigation@3",
           "when": "scmProvider == dvc && dvc.commands.available == true"
         },
         {
           "command": "dvc.push",
-          "group": "navigation",
+          "group": "navigation@4",
+          "when": "scmProvider == dvc && dvc.commands.available == true"
+        },
+        {
+          "command": "dvc.checkout",
+          "group": "DVC",
           "when": "scmProvider == dvc && dvc.commands.available == true"
         }
       ],

extension/package.nls.json

@@ -31,6 +31,7 @@
   "command.removeExperimentsTableSorts": "Remove Sort(s) From Experiments Table",
   "command.removeTarget": "Remove",
   "command.renameTarget": "Rename",
+  "command.resetWorkspace": "Reset the Workspace",
   "command.runExperiment": "Run Experiment",
   "command.runQueuedExperiments": "Run All Queued Experiments",
   "command.runResetExperiment": "Run and Reset Experiment",

extension/src/commands/external.ts

@@ -42,6 +42,8 @@ export enum RegisteredCommands {
   DELETE_TARGET = 'dvc.deleteTarget',
   MOVE_TARGETS = 'dvc.moveTargets',
 
+  RESET_WORKSPACE = 'dvc.resetWorkspace',
+
   TRACKED_EXPLORER_OPEN_FILE = 'dvc.views.trackedExplorerTree.openFile',
   TRACKED_EXPLORER_COMPARE_SELECTED = 'dvc.compareSelected',
   TRACKED_EXPLORER_COPY_FILE_PATH = 'dvc.copyFilePath',

extension/src/git.ts

@@ -43,3 +43,18 @@ export const getAllUntracked = async (
   ])
   return new Set([...files, ...dirs])
 }
+
+export const gitResetWorkspace = async (
+  repositoryRoot: string
+): Promise<void> => {
+  await executeProcess({
+    args: ['reset', '--hard', 'HEAD'],
+    cwd: repositoryRoot,
+    executable: 'git'
+  })
+  await executeProcess({
+    args: ['clean', '-f', '-d', '-q'],
+    cwd: repositoryRoot,
+    executable: 'git'
+  })
+}

extension/src/repository/commands/index.ts

@@ -1,7 +1,14 @@
 import { relative } from 'path'
 import { Uri } from 'vscode'
 import { tryThenMaybeForce } from '../../cli/actions'
-import { CommandId, InternalCommands } from '../../commands/internal'
+import { Flag } from '../../cli/args'
+import {
+  AvailableCommands,
+  CommandId,
+  InternalCommands
+} from '../../commands/internal'
+import { gitResetWorkspace } from '../../git'
+import { getWarningResponse } from '../../vscode/modal'
 
 export type Resource = {
   dvcRoot: string
@@ -40,3 +47,28 @@ export const getRootCommand =
 
     return tryThenMaybeForce(internalCommands, commandId, cwd)
   }
+
+export const getResetRootCommand =
+  (internalCommands: InternalCommands): RootCommand =>
+  async ({ rootUri }) => {
+    const cwd = rootUri.fsPath
+
+    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.',
+      'Discard Changes'
+    )
+
+    if (response !== 'Discard Changes') {
+      return
+    }
+
+    await gitResetWorkspace(cwd)
+
+    return internalCommands.executeCommand(
+      AvailableCommands.CHECKOUT,
+      cwd,
+      Flag.FORCE
+    )
+  }

extension/src/repository/commands/register.ts

@@ -1,13 +1,17 @@
 import { commands } from 'vscode'
 import {
+  getResetRootCommand,
   getResourceCommand,
   getRootCommand,
   getSimpleResourceCommand,
   Resource,
   Root
 } from '.'
 import { tryThenMaybeForce } from '../../cli/actions'
-import { RegisteredCliCommands } from '../../commands/external'
+import {
+  RegisteredCliCommands,
+  RegisteredCommands
+} from '../../commands/external'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
 
 const registerResourceCommands = (internalCommands: InternalCommands): void => {
@@ -52,6 +56,11 @@ const registerRootCommands = (internalCommands: InternalCommands) => {
     RegisteredCliCommands.PUSH,
     getRootCommand(internalCommands, AvailableCommands.PUSH)
   )
+
+  internalCommands.registerExternalCommand<Root>(
+    RegisteredCommands.RESET_WORKSPACE,
+    getResetRootCommand(internalCommands)
+  )
 }
 
 export const registerRepositoryCommands = (

extension/src/telemetry/constants.ts

@@ -93,6 +93,7 @@ export interface IEventNamePropertyMapping {
   [EventName.PUSH]: undefined
   [EventName.REMOVE_TARGET]: undefined
   [EventName.RENAME_TARGET]: undefined
+  [EventName.RESET_WORKSPACE]: undefined
 
   [EventName.TRACKED_EXPLORER_COMPARE_SELECTED]: undefined
   [EventName.TRACKED_EXPLORER_COPY_FILE_PATH]: undefined

extension/src/test/suite/repository/sourceControlManagement.test.ts

@@ -6,7 +6,11 @@ import { window, commands, Uri, MessageItem } from 'vscode'
 import { Disposable } from '../../../extension'
 import { CliExecutor } from '../../../cli/executor'
 import { dvcDemoPath } from '../util'
-import { RegisteredCliCommands } from '../../../commands/external'
+import {
+  RegisteredCliCommands,
+  RegisteredCommands
+} from '../../../commands/external'
+import * as ProcessExecution from '../../../processExecution'
 
 suite('Source Control Management Test Suite', () => {
   const disposable = Disposable.fn()
@@ -179,5 +183,51 @@ suite('Source Control Management Test Suite', () => {
       expect(mockPush).to.be.calledOnce
       expect(mockShowErrorMessage).to.be.calledOnce
     })
+
+    it('should not reset the workspace if the user does not confirm', async () => {
+      const mockCheckout = stub(CliExecutor.prototype, 'checkout').resolves('')
+      const mockGitReset = stub(ProcessExecution, 'executeProcess').resolves('')
+
+      const mockShowWarningMessage = stub(
+        window,
+        'showWarningMessage'
+      ).resolves('' as unknown as MessageItem)
+
+      await commands.executeCommand(RegisteredCommands.RESET_WORKSPACE, {
+        rootUri
+      })
+
+      expect(mockShowWarningMessage).to.be.calledOnce
+      expect(mockCheckout).not.to.be.called
+      expect(mockGitReset).not.to.be.called
+    })
+
+    it('should reset the workspace if the user confirms they want to', async () => {
+      const mockCheckout = stub(CliExecutor.prototype, 'checkout').resolves('')
+      const mockGitReset = stub(ProcessExecution, 'executeProcess').resolves('')
+
+      const mockShowWarningMessage = stub(
+        window,
+        'showWarningMessage'
+      ).resolves('Discard Changes' as unknown as MessageItem)
+
+      await commands.executeCommand(RegisteredCommands.RESET_WORKSPACE, {
+        rootUri
+      })
+
+      expect(mockShowWarningMessage).to.be.calledOnce
+      expect(mockCheckout).to.be.calledOnce
+      expect(mockGitReset).to.be.calledTwice
+      expect(mockGitReset).to.be.calledWith({
+        args: ['reset', '--hard', 'HEAD'],
+        cwd: dvcDemoPath,
+        executable: 'git'
+      })
+      expect(mockGitReset).to.be.calledWith({
+        args: ['clean', '-f', '-d', '-q'],
+        cwd: dvcDemoPath,
+        executable: 'git'
+      })
+    })
   })
 })