Merge branch 'main' into revert-slider-bg

extension/package.json

@@ -1654,8 +1654,8 @@
     "@types/vscode": "1.64.0",
     "@vscode/test-electron": "2.3.0",
     "@vscode/vsce": "2.18.0",
-    "@wdio/cli": "8.5.1",
-    "@wdio/local-runner": "8.5.4",
+    "@wdio/cli": "8.5.5",
+    "@wdio/local-runner": "8.5.5",
     "@wdio/mocha-framework": "8.4.0",
     "@wdio/spec-reporter": "8.4.0",
     "chai": "4.3.7",
@@ -1665,7 +1665,7 @@
     "fork-ts-checker-webpack-plugin": "7.3.0",
     "jest": "29.4.3",
     "jest-environment-node": "29.4.3",
-    "lint-staged": "13.1.2",
+    "lint-staged": "13.1.3",
     "mocha": "10.2.0",
     "mock-require": "3.0.3",
     "process-exists": "4.1.0",
@@ -1675,7 +1675,7 @@
     "ts-loader": "9.4.2",
     "vscode-uri": "3.0.7",
     "wdio-vscode-service": "5.0.0",
-    "webdriverio": "8.5.1",
+    "webdriverio": "8.5.5",
     "webpack": "5.75.0",
     "webpack-cli": "5.0.1"
   },

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

@@ -12,6 +12,7 @@ import { getProcessEnv } from '../../env'
 import expShowFixture from '../../test/fixtures/expShow/base/output'
 import plotsDiffFixture from '../../test/fixtures/plotsDiff/output/minimal'
 import { Config } from '../../config'
+import { joinEnvPath } from '../../util/env'
 
 jest.mock('vscode')
 jest.mock('@hediet/std/disposable')
@@ -31,6 +32,8 @@ const mockedEnv = {
 }
 const JSON_FLAG = '--json'
 
+const mockedGetPythonBinPath = jest.fn()
+
 beforeEach(() => {
   jest.resetAllMocks()
   mockedGetProcessEnv.mockReturnValueOnce(mockedEnv)
@@ -49,7 +52,7 @@ describe('CliReader', () => {
   const dvcReader = new DvcReader(
     {
       getCliPath: () => undefined,
-      getPythonBinPath: () => undefined
+      getPythonBinPath: mockedGetPythonBinPath
     } as unknown as Config,
     {
       processCompleted: {
@@ -144,6 +147,33 @@ describe('CliReader', () => {
     })
   })
 
+  describe('globalVersion', () => {
+    it('should call execute process with the correct parameters (does not respect pythonBinPath)', async () => {
+      const cwd = __dirname
+      const stdout = '3.9.11'
+      mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
+      mockedGetPythonBinPath.mockReturnValueOnce('python')
+      const output = await dvcReader.globalVersion(cwd)
+
+      expect(output).toStrictEqual(stdout)
+      expect(mockedCreateProcess).toHaveBeenCalledWith({
+        args: ['--version'],
+        cwd,
+        env: mockedEnv,
+        executable: 'dvc'
+      })
+    })
+
+    it('should not retry if the process fails (cannot find cli - extension should reset)', async () => {
+      const cwd = __dirname
+      mockedCreateProcess.mockImplementationOnce(() => {
+        throw new Error('spawn dvc ENOENT retrying...')
+      })
+
+      await expect(dvcReader.globalVersion(cwd)).rejects.toBeTruthy()
+    })
+  })
+
   describe('plotsDiff', () => {
     it('should handle empty output being returned', async () => {
       const cwd = __dirname
@@ -229,6 +259,27 @@ describe('CliReader', () => {
       })
     })
 
+    it('should respect the pythonBinPath parameters', async () => {
+      const cwd = __dirname
+      const stdout = '2.47.0'
+      const mockedPythonPath = 'some/python/path'
+      const mockedPythonBinPath = [mockedPythonPath, 'python'].join('/')
+      mockedGetPythonBinPath.mockReturnValue(mockedPythonBinPath)
+      mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
+      const output = await dvcReader.version(cwd)
+
+      expect(output).toStrictEqual(stdout)
+      expect(mockedCreateProcess).toHaveBeenCalledWith({
+        args: ['-m', 'dvc', '--version'],
+        cwd,
+        env: {
+          ...mockedEnv,
+          PATH: joinEnvPath(mockedPythonPath, mockedEnv.PATH)
+        },
+        executable: mockedPythonBinPath
+      })
+    })
+
     it('should not retry if the process fails (cannot find cli - extension should reset)', async () => {
       const cwd = __dirname
       mockedCreateProcess.mockImplementationOnce(() => {

extension/src/cli/dvc/reader.ts

@@ -37,8 +37,11 @@ export const isDvcError = <
 export const autoRegisteredCommands = {
   DATA_STATUS: 'dataStatus',
   EXP_SHOW: 'expShow',
+  GLOBAL_VERSION: 'globalVersion',
   PLOTS_DIFF: 'plotsDiff',
-  STAGE_LIST: 'listStages'
+  ROOT: 'root',
+  STAGE_LIST: 'listStages',
+  VERSION: 'version'
 } as const
 
 export class DvcReader extends DvcCli {
@@ -104,9 +107,13 @@ export class DvcReader extends DvcCli {
     } catch {}
   }
 
-  public version(cwd: string, isCliGlobal?: true): Promise<string> {
+  public version(cwd: string): Promise<string> {
+    return this.executeDvcProcess(cwd, Flag.VERSION)
+  }
+
+  public globalVersion(cwd: string): Promise<string> {
     const options = getOptions(
-      isCliGlobal ? undefined : this.config.getPythonBinPath(),
+      undefined,
       this.config.getCliPath(),
       cwd,
       Flag.VERSION

extension/src/cli/git/executor.ts

@@ -4,6 +4,7 @@ import { getOptions } from './options'
 import { typeCheckCommands } from '..'
 
 export const autoRegisteredCommands = {
+  GIT_INIT: 'gitInit',
   GIT_PUSH_BRANCH: 'pushBranch',
   GIT_RESET_WORKSPACE: 'resetWorkspace',
   GIT_STAGE_ALL: 'stageAll',
@@ -17,7 +18,7 @@ export class GitExecutor extends GitCli {
     this
   )
 
-  public init(cwd: string) {
+  public gitInit(cwd: string) {
     const options = getOptions(cwd, Command.INITIALIZE)
 
     return this.executeProcess(options)

extension/src/cli/git/reader.ts

@@ -11,6 +11,7 @@ export const autoRegisteredCommands = {
   GIT_GET_REMOTE_URL: 'getRemoteUrl',
   GIT_GET_REPOSITORY_ROOT: 'getGitRepositoryRoot',
   GIT_HAS_CHANGES: 'hasChanges',
+  GIT_HAS_NO_COMMITS: 'hasNoCommits',
   GIT_LIST_UNTRACKED: 'listUntracked'
 } as const
 

extension/src/extension.ts

@@ -56,7 +56,10 @@ import { LanguageClient } from './languageClient'
 import { collectRunningExperimentPids } from './experiments/processExecution/collect'
 import { registerPatchCommand } from './patch'
 import { DvcViewer } from './cli/dvc/viewer'
+import { registerSetupCommands } from './setup/register'
+import { Status } from './status'
 import { registerPersistenceCommands } from './persistence/register'
+
 export class Extension extends Disposable {
   protected readonly internalCommands: InternalCommands
 
@@ -132,6 +135,8 @@ export class Extension extends Disposable {
       new InternalCommands(outputChannel, ...clis)
     )
 
+    const status = this.dispose.track(new Status(config, ...clis))
+
     this.experiments = this.dispose.track(
       new WorkspaceExperiments(
         this.internalCommands,
@@ -184,18 +189,14 @@ export class Extension extends Disposable {
 
     this.setup = this.dispose.track(
       new Setup(
-        stopWatch,
         config,
-        this.dvcExecutor,
-        this.dvcReader,
-        this.dvcRunner,
-        this.gitExecutor,
-        this.gitReader,
-        () => this.initialize(),
-        () => this.resetMembers(),
-        this.experiments,
         this.internalCommands,
+        this.experiments,
+        status,
         this.resourceLocator.dvcIcon,
+        stopWatch,
+        () => this.initialize(),
+        () => this.resetMembers(),
         () =>
           collectWorkspaceScale(
             this.getRoots(),
@@ -216,6 +217,7 @@ export class Extension extends Disposable {
       this.connect
     )
     registerPlotsCommands(this.plots, this.internalCommands, this.setup)
+    registerSetupCommands(this.setup, this.internalCommands)
     this.internalCommands.registerExternalCommand(
       RegisteredCommands.EXPERIMENT_AND_PLOTS_SHOW,
       async (context: VsCodeContext) => {