Implement get_repository_for_commit to filter for repositories with active changes when generating commit messages

Author: robertpiosik

apps/editor/src/commands/generate-commit-message-command/generate-commit-message-command.ts

@@ -1,9 +1,9 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
 import {
-  get_git_repository,
   prepare_staged_changes,
-  GitRepository
+  GitRepository,
+  get_repository_for_commit
 } from '../../utils/git-repository-utils'
 import { display_token_count } from '../../utils/display-token-count'
 import { get_commit_message_config } from './utils/get-commit-message-config'
@@ -14,6 +14,7 @@ import axios from 'axios'
 import { PromptsForCommitMessagesUtils } from '../../utils/prompts-for-commit-messages-utils'
 import { simplify_prompt_symbols } from '@shared/utils/simplify-prompt-symbols'
 import { MAX_PROMPT_CHARS_IN_COMMIT_MESSAGE } from '@/constants/values'
+import { dictionary } from '@shared/constants/dictionary'
 
 const truncate_prompt = (text: string): string => {
   if (text.length <= MAX_PROMPT_CHARS_IN_COMMIT_MESSAGE) return text
@@ -52,7 +53,7 @@ export const generate_commit_message_command = (
     let force_quick_pick = false
     const selection_state: { files?: string[] } = {}
 
-    const repository = await get_git_repository(params.source_control)
+    const repository = await get_repository_for_commit(params.source_control)
     if (!repository) return
 
     while (true) {
@@ -291,7 +292,7 @@ export const generate_commit_message_command = (
   const copy_command = vscode.commands.registerCommand(
     'codeWebChat.copyCommitMessagePrompt',
     async (source_control?: vscode.SourceControl) => {
-      const repository = await get_git_repository(source_control)
+      const repository = await get_repository_for_commit(source_control)
       if (!repository) return
       const data = await get_prompt_data(repository, !!source_control)
       if (!data) return

apps/editor/src/utils/git-repository-utils.ts

@@ -20,9 +20,7 @@ export type GitRepository = {
   show: (ref: string, path: string) => Promise<string>
 }
 
-export const get_git_repository = async (
-  source_control?: vscode.SourceControl
-): Promise<GitRepository | null> => {
+export const get_all_git_repositories = (): GitRepository[] | null => {
   const git_extension = vscode.extensions.getExtension('vscode.git')
   if (!git_extension) {
     vscode.window.showErrorMessage(
@@ -41,6 +39,54 @@ export const get_git_repository = async (
     return null
   }
 
+  return repositories
+}
+
+export const get_git_repository = async (
+  source_control?: vscode.SourceControl
+): Promise<GitRepository | null> => {
+  const repositories = get_all_git_repositories()
+  if (!repositories) return null
+
+  if (source_control?.rootUri) {
+    const repository = repositories.find(
+      (repo) => repo.rootUri.toString() === source_control.rootUri!.toString()
+    )
+    if (repository) {
+      return repository
+    }
+  }
+
+  if (repositories.length == 1) {
+    return repositories[0]
+  }
+
+  const picks = repositories.map((repo) => {
+    const folder = vscode.workspace.getWorkspaceFolder(repo.rootUri)
+    return {
+      label: folder ? folder.name : path.basename(repo.rootUri.fsPath),
+      description: repo.rootUri.fsPath,
+      repository: repo
+    }
+  })
+
+  const selected = await vscode.window.showQuickPick(picks, {
+    placeHolder: t('command.commit-message.select-repository')
+  })
+
+  if (!selected) {
+    return null
+  }
+
+  return selected.repository
+}
+
+export const get_repository_for_commit = async (
+  source_control?: vscode.SourceControl
+): Promise<GitRepository | null> => {
+  const repositories = get_all_git_repositories()
+  if (!repositories) return null
+
   if (source_control?.rootUri) {
     const repository = repositories.find(
       (repo) => repo.rootUri.toString() === source_control.rootUri!.toString()