Force commit action by default (#3726)

Author: mattseddon

extension/src/cli/dvc/executor.test.ts

@@ -199,30 +199,14 @@ describe('CliExecutor', () => {
   })
 
   describe('commit', () => {
-    it('should call createProcess with the correct parameters to commit a repository', async () => {
+    it('should call createProcess with the correct parameters to force commit a repository (by default)', async () => {
       const cwd = __dirname
       const stdout = updatingLockFile
       mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
 
       const output = await dvcExecutor.commit(cwd)
       expect(output).toStrictEqual(stdout)
 
-      expect(mockedCreateProcess).toHaveBeenCalledWith({
-        args: ['commit'],
-        cwd,
-        env: mockedEnv,
-        executable: 'dvc'
-      })
-    })
-
-    it('should call createProcess with the correct parameters to force commit a repository', async () => {
-      const cwd = __dirname
-      const stdout = updatingLockFile
-      mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
-
-      const output = await dvcExecutor.commit(cwd, Flag.FORCE)
-      expect(output).toStrictEqual(stdout)
-
       expect(mockedCreateProcess).toHaveBeenCalledWith({
         args: ['commit', '-f'],
         cwd,
@@ -231,7 +215,7 @@ describe('CliExecutor', () => {
       })
     })
 
-    it('should call createProcess with the correct parameters to commit a target', async () => {
+    it('should call createProcess with the correct parameters to commit a target (force by default)', async () => {
       const cwd = __dirname
       const relPath = join(
         'data',
@@ -245,28 +229,6 @@ describe('CliExecutor', () => {
       const output = await dvcExecutor.commit(cwd, relPath)
       expect(output).toStrictEqual(stdout)
 
-      expect(mockedCreateProcess).toHaveBeenCalledWith({
-        args: ['commit', relPath],
-        cwd,
-        env: mockedEnv,
-        executable: 'dvc'
-      })
-    })
-
-    it('should call createProcess with the correct parameters to force commit a target', async () => {
-      const cwd = __dirname
-      const relPath = join(
-        'data',
-        'fashion-mnist',
-        'raw',
-        't10k-images-idx3-ubyte.gz'
-      )
-      const stdout = updatingLockFile
-      mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
-
-      const output = await dvcExecutor.commit(cwd, relPath, Flag.FORCE)
-      expect(output).toStrictEqual(stdout)
-
       expect(mockedCreateProcess).toHaveBeenCalledWith({
         args: ['commit', relPath, '-f'],
         cwd,

extension/src/cli/dvc/executor.ts

@@ -68,7 +68,7 @@ export class DvcExecutor extends DvcCli {
   }
 
   public commit(cwd: string, ...args: Args) {
-    return this.blockAndExecuteProcess(cwd, Command.COMMIT, ...args)
+    return this.blockAndExecuteProcess(cwd, Command.COMMIT, ...args, Flag.FORCE)
   }
 
   public experimentApply(cwd: string, experimentName: string) {

extension/src/repository/commands/index.ts

@@ -115,8 +115,7 @@ export const getCommitRootCommand =
       return
     }
 
-    await tryThenMaybeForce(
-      internalCommands,
+    await internalCommands.executeCommand(
       AvailableCommands.COMMIT,
       cwd as string
     )

extension/src/repository/commands/register.ts

@@ -29,7 +29,7 @@ const registerResourceCommands = (internalCommands: InternalCommands): void => {
 
   internalCommands.registerExternalCliCommand<Resource>(
     RegisteredCliCommands.COMMIT_TARGET,
-    getResourceCommand(internalCommands, AvailableCommands.COMMIT)
+    getSimpleResourceCommand(internalCommands, AvailableCommands.COMMIT)
   )
 }
 

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

@@ -120,29 +120,20 @@ suite('Source Control Management Test Suite', () => {
       expect(executeCommandSpy).to.be.calledWith('workbench.scm.focus')
     })
 
-    it('should prompt to force if dvc.commit fails', async () => {
+    it('should not prompt to force if dvc.commit fails', async () => {
       const mockCommit = stub(DvcExecutor.prototype, 'commit')
         .onFirstCall()
         .rejects({
           stderr: 'Use `-f` to force.'
         })
-        .onSecondCall()
-        .resolves('')
-      const mockShowWarningMessage = stub(
-        window,
-        'showWarningMessage'
-      ).resolves('Force' as unknown as MessageItem)
-
       stubPrivatePrototypeMethod(WorkspaceRepositories, 'hasChanges').returns(
         true
       )
 
       await commands.executeCommand(RegisteredCliCommands.COMMIT, { rootUri })
 
-      expect(mockCommit).to.be.calledTwice
-      expect(mockShowWarningMessage).to.be.calledOnce
-      expect(mockCommit).to.be.calledWith(dvcDemoPath)
-      expect(mockCommit).to.be.calledWith(dvcDemoPath, '-f')
+      expect(mockCommit).to.be.calledOnce
+      expect(mockCommit).to.be.calledWithExactly(dvcDemoPath)
     })
 
     it('should be able to run dvc.commitTarget without error', async () => {
@@ -156,30 +147,6 @@ suite('Source Control Management Test Suite', () => {
       expect(mockCommit).to.be.calledOnce
     })
 
-    it('should prompt to force if dvc.commitTarget fails', async () => {
-      const mockCommit = stub(DvcExecutor.prototype, 'commit')
-        .onFirstCall()
-        .rejects({
-          stderr: 'Use `-f` to force.'
-        })
-        .onSecondCall()
-        .resolves('')
-      const mockShowWarningMessage = stub(
-        window,
-        'showWarningMessage'
-      ).resolves('Force' as unknown as MessageItem)
-
-      await commands.executeCommand(RegisteredCliCommands.COMMIT_TARGET, {
-        dvcRoot: dvcDemoPath,
-        resourceUri
-      })
-
-      expect(mockCommit).to.be.calledTwice
-      expect(mockShowWarningMessage).to.be.calledOnce
-      expect(mockCommit).to.be.calledWith(dvcDemoPath, relPath)
-      expect(mockCommit).to.be.calledWith(dvcDemoPath, relPath, '-f')
-    })
-
     it('should not prompt to force if dvc.pull fails without a prompt error', async () => {
       const mockPull = stub(DvcExecutor.prototype, 'pull')
         .onFirstCall()