Add a mapping from revision to branches while using only one exp show call

extension/src/cli/dvc/contract.ts

@@ -1,3 +1,4 @@
+import { CommitData } from '../../experiments/webview/contract'
 import { Plot } from '../../plots/webview/contract'
 
 export const MIN_CLI_VERSION = '2.55.0'
@@ -98,13 +99,17 @@ export type ExpWithError = {
   rev: string
   name?: string
   branch: string | undefined
+  commit?: CommitData
+  description?: string
 } & DvcError
 
 type ExpWithData = {
   rev: string
   name?: string
   branch: string | undefined
   data: ExpData
+  commit?: CommitData
+  description?: string
 }
 
 export type ExpState = ExpWithData | ExpWithError

extension/src/cli/git/constants.ts

@@ -50,6 +50,4 @@ export enum Commit {
 
 export const DEFAULT_REMOTE = 'origin'
 
-export const COMMITS_SEPARATOR = '\u0000'
-
 export type Args = (Command | Flag | Commit | typeof DEFAULT_REMOTE | string)[]

extension/src/experiments/data/index.ts

@@ -7,12 +7,23 @@ import {
 import { getRelativePattern } from '../../fileSystem/relativePattern'
 import { createFileSystemWatcher } from '../../fileSystem/watcher'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
-import { EXPERIMENT_WORKSPACE_ID, ExpShowOutput } from '../../cli/dvc/contract'
+import {
+  EXPERIMENT_WORKSPACE_ID,
+  ExpRange,
+  ExpShowOutput,
+  ExpState
+} from '../../cli/dvc/contract'
 import { BaseData } from '../../data'
 import { DOT_DVC, ExperimentFlag } from '../../cli/dvc/constants'
 import { gitPath } from '../../cli/git/constants'
 import { getGitPath } from '../../fileSystem'
 import { ExperimentsModel } from '../model'
+import { formatCommitMessage, getCommitDataFromOutput } from '../model/collect'
+import { CommitData } from '../webview/contract'
+
+interface HashInfo extends CommitData {
+  branches: string[]
+}
 
 export class ExperimentsData extends BaseData<ExpShowOutput> {
   private readonly experiments: ExperimentsModel
@@ -47,36 +58,32 @@ export class ExperimentsData extends BaseData<ExpShowOutput> {
     )
 
     void this.updateAvailableBranchesToSelect(allBranches)
-    const data: ExpShowOutput = []
 
     const { branches, currentBranch } = await this.getBranchesToShowWithCurrent(
       allBranches
     )
+    const flags: (ExperimentFlag | string)[] = []
+    const hashes: Record<string, HashInfo> = {}
 
-    await Promise.all(
-      branches.map(async branch => {
-        const branchFlags = [
-          ExperimentFlag.REV,
-          branch,
-          ExperimentFlag.NUM_COMMIT,
-          this.experiments.getNbOfCommitsToShow(branch).toString()
-        ]
-
-        const output = (await this.expShow(
-          branchFlags,
-          branch
-        )) as ExpShowOutput
-
-        if (branch !== currentBranch) {
-          const workspaceIndex = output.findIndex(
-            exp => exp.rev === EXPERIMENT_WORKSPACE_ID
-          )
-          output.splice(workspaceIndex, 1)
-        }
-        data.push(...output)
-      })
+    for (const branch of branches) {
+      await this.collectRevisionGitDetails(branch, hashes, flags)
+    }
+
+    const output = await this.internalCommands.executeCommand<ExpShowOutput>(
+      AvailableCommands.EXP_SHOW,
+      this.dvcRoot,
+      ...flags
     )
 
+    const data: ExpShowOutput = []
+    for (const out of output) {
+      if (out.rev === EXPERIMENT_WORKSPACE_ID) {
+        data.push({ ...out, branch: currentBranch })
+      } else {
+        this.addDetailsToRevision(out, data, hashes)
+      }
+    }
+
     this.collectFiles(data)
 
     return this.notifyChanged(data)
@@ -86,6 +93,58 @@ export class ExperimentsData extends BaseData<ExpShowOutput> {
     this.collectedFiles = collectFiles(data, this.collectedFiles)
   }
 
+  private async collectRevisionGitDetails(
+    branch: string,
+    hashes: Record<string, HashInfo>,
+    flags: (ExperimentFlag | string)[]
+  ) {
+    const nbOfCommitsToShow = this.experiments.getNbOfCommitsToShow(branch)
+
+    for (let i = 0; i < nbOfCommitsToShow; i++) {
+      const revision = `${branch}~${i}`
+
+      const commitDataOutput = await this.internalCommands.executeCommand(
+        AvailableCommands.GIT_GET_COMMIT_MESSAGES,
+        this.dvcRoot,
+        revision
+      )
+
+      const { hash, ...commitData } = getCommitDataFromOutput(commitDataOutput)
+
+      if (hashes[hash]) {
+        hashes[hash].branches.push(branch)
+      } else {
+        hashes[hash] = {
+          branches: [branch],
+          ...commitData
+        }
+      }
+
+      flags.push(ExperimentFlag.REV, revision)
+    }
+  }
+
+  private addDetailsToRevision(
+    out: ExpState & {
+      experiments?: ExpRange[] | null | undefined
+    },
+    data: ExpShowOutput,
+    hashes: Record<string, HashInfo>
+  ) {
+    const revision = hashes[out.rev]
+    if (revision) {
+      const { branches, ...commit } = revision
+      for (const branch of branches) {
+        data.push({
+          ...out,
+          branch,
+          commit,
+          description: formatCommitMessage(commit.message)
+        })
+      }
+    }
+  }
+
   private async getBranchesToShowWithCurrent(allBranches: string[]) {
     const currentBranch = await this.internalCommands.executeCommand<string>(
       AvailableCommands.GIT_GET_CURRENT_BRANCH,
@@ -100,16 +159,8 @@ export class ExperimentsData extends BaseData<ExpShowOutput> {
       branches.push(currentBranch)
       this.experiments.setBranchesToShow(branches)
     }
-    return { branches, currentBranch }
-  }
 
-  private async expShow(flags: (ExperimentFlag | string)[], branch?: string) {
-    const data = await this.internalCommands.executeCommand<ExpShowOutput>(
-      AvailableCommands.EXP_SHOW,
-      this.dvcRoot,
-      ...flags
-    )
-    return data.map(exp => ({ ...exp, branch }))
+    return { branches, currentBranch }
   }
 
   private async updateAvailableBranchesToSelect(branches?: string[]) {

extension/src/experiments/index.ts

@@ -42,7 +42,7 @@ import { DecorationProvider } from './model/decorationProvider'
 import { starredFilter } from './model/filterBy/constants'
 import { ResourceLocator } from '../resourceLocator'
 import { AvailableCommands, InternalCommands } from '../commands/internal'
-import { EXPERIMENT_WORKSPACE_ID, ExpShowOutput } from '../cli/dvc/contract'
+import { ExpShowOutput } from '../cli/dvc/contract'
 import { ViewKey } from '../webview/constants'
 import { BaseRepository } from '../webview/repository'
 import { Title } from '../vscode/title'
@@ -52,7 +52,6 @@ import { Toast } from '../vscode/toast'
 import { ConfigKey } from '../vscode/config'
 import { checkSignalFile, pollSignalFileForProcess } from '../fileSystem'
 import { DVCLIVE_ONLY_RUNNING_SIGNAL_FILE } from '../cli/dvc/constants'
-import { COMMITS_SEPARATOR } from '../cli/git/constants'
 
 export const ExperimentsScale = {
   ...omit(ColumnType, 'TIMESTAMP'),
@@ -181,10 +180,9 @@ export class Experiments extends BaseRepository<TableData> {
   public async setState(data: ExpShowOutput) {
     const hadCheckpoints = this.hasCheckpoints()
     const dvcLiveOnly = await this.checkSignalFile()
-    const commitsOutput = await this.getCommitOutput(data)
     await Promise.all([
       this.columns.transformAndSet(data),
-      this.experiments.transformAndSet(data, dvcLiveOnly, commitsOutput)
+      this.experiments.transformAndSet(data, dvcLiveOnly)
     ])
 
     if (hadCheckpoints !== this.hasCheckpoints()) {
@@ -568,25 +566,6 @@ export class Experiments extends BaseRepository<TableData> {
     return this.webviewMessages.sendWebviewMessage()
   }
 
-  private async getCommitOutput(data: ExpShowOutput | undefined) {
-    if (!data || data.length === 0) {
-      return
-    }
-    let output = ''
-    for (const commit of data) {
-      if (commit.rev === EXPERIMENT_WORKSPACE_ID) {
-        continue
-      }
-      output += await this.internalCommands.executeCommand(
-        AvailableCommands.GIT_GET_COMMIT_MESSAGES,
-        this.dvcRoot,
-        commit.rev
-      )
-      output += COMMITS_SEPARATOR
-    }
-    return output
-  }
-
   private createWebviewMessageHandler() {
     const webviewMessages = new WebviewMessages(
       this.dvcRoot,

extension/src/experiments/model/collect.test.ts

@@ -1,14 +1,9 @@
 import { collectExperiments } from './collect'
-import { COMMITS_SEPARATOR } from '../../cli/git/constants'
 import { generateTestExpShowOutput } from '../../test/util/experiments'
 
 describe('collectExperiments', () => {
   it('should return an empty array if no commits are present', () => {
-    const { commits } = collectExperiments(
-      generateTestExpShowOutput({}),
-      false,
-      ''
-    )
+    const { commits } = collectExperiments(generateTestExpShowOutput({}), false)
     expect(commits).toStrictEqual([])
   })
 
@@ -26,19 +21,19 @@ describe('collectExperiments', () => {
   )
 
   it('should define a workspace', () => {
-    const { workspace } = collectExperiments(expShowWithTwoCommits, false, '')
+    const { workspace } = collectExperiments(expShowWithTwoCommits, false)
 
     expect(workspace).toBeDefined()
   })
 
   it('should find two branches from a repo with two branches', () => {
-    const { commits } = collectExperiments(expShowWithTwoCommits, false, '')
+    const { commits } = collectExperiments(expShowWithTwoCommits, false)
 
     expect(commits.length).toStrictEqual(2)
   })
 
   it('should list commits in the same order as they are collected', () => {
-    const { commits } = collectExperiments(expShowWithTwoCommits, false, '')
+    const { commits } = collectExperiments(expShowWithTwoCommits, false)
     const [commitA, commitB] = commits
 
     expect(commitA.id).toStrictEqual('branchA')
@@ -48,44 +43,19 @@ describe('collectExperiments', () => {
   it('should find two experiments on commitA', () => {
     const { experimentsByCommit } = collectExperiments(
       expShowWithTwoCommits,
-      false,
-      ''
+      false
     )
     expect(experimentsByCommit.get('branchA')?.length).toStrictEqual(2)
   })
 
   it('should find no experiments on branchB', () => {
     const { experimentsByCommit } = collectExperiments(
       expShowWithTwoCommits,
-      false,
-      ''
+      false
     )
     expect(experimentsByCommit.get('branchB')).toBeUndefined()
   })
 
-  it('should add data from git to commits if git log output is provided', () => {
-    const { commits } = collectExperiments(
-      expShowWithTwoCommits,
-      false,
-      `61bed4ce8913eca7f73ca754d65bc5daad1520e2\nJohn Smith\n3 days ago\nrefNames:tag: v.1.1\nmessage:add new feature${COMMITS_SEPARATOR}351e42ace3cb6a3a853c65bef285e60748cc6341\nrenovate[bot]\n5 weeks ago\nrefNames:\nmessage:update various dependencies\n* update dvc\n* update dvclive`
-    )
-    const [branch1, branch2] = commits
-    expect(branch1.description).toStrictEqual('add new feature')
-    expect(branch2.description).toStrictEqual('update various dependencies ...')
-    expect(branch1.commit).toStrictEqual({
-      author: 'John Smith',
-      date: '3 days ago',
-      message: 'add new feature',
-      tags: ['v.1.1']
-    })
-    expect(branch2.commit).toStrictEqual({
-      author: 'renovate[bot]',
-      date: '5 weeks ago',
-      message: 'update various dependencies\n* update dvc\n* update dvclive',
-      tags: []
-    })
-  })
-
   it('should not collect the same experiment twice', () => {
     const main = {
       experiments: [
@@ -114,8 +84,7 @@ describe('collectExperiments', () => {
 
     const { experimentsByCommit, commits } = collectExperiments(
       expShowWithDuplicateCommits,
-      false,
-      ''
+      false
     )
 
     expect(commits.length).toStrictEqual(3)