Refactor repository selection with interactive picker and improve unstaging logic

Author: robertpiosik

packages/vscode/src/utils/git-repository-utils.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode'
 import { execSync } from 'child_process'
 import { dictionary } from '@shared/constants/dictionary'
+import * as path from 'path'
 
 export interface GitRepository {
   rootUri: vscode.Uri
@@ -16,9 +17,9 @@ export interface GitRepository {
   show: (ref: string, path: string) => Promise<string>
 }
 
-export function get_git_repository(
+export async function get_git_repository(
   source_control?: vscode.SourceControl
-): GitRepository | null {
+): Promise<GitRepository | null> {
   const git_extension = vscode.extensions.getExtension('vscode.git')
   if (!git_extension) {
     vscode.window.showErrorMessage(
@@ -28,7 +29,7 @@ export function get_git_repository(
   }
 
   const git_api = git_extension.exports.getAPI(1)
-  const repositories = git_api.repositories
+  const repositories: GitRepository[] = git_api.repositories
 
   if (!repositories || repositories.length === 0) {
     vscode.window.showErrorMessage(
@@ -37,28 +38,52 @@ export function get_git_repository(
     return null
   }
 
-  let repository
-
-  // If source_control is provided and has rootUri, find matching repository
   if (source_control?.rootUri) {
-    repository = repositories.find(
-      (repo: any) =>
-        repo.rootUri.toString() === source_control.rootUri!.toString()
+    const repository = repositories.find(
+      (repo) => repo.rootUri.toString() === source_control.rootUri!.toString()
     )
+    if (repository) {
+      return repository
+    }
+  }
+
+  if (repositories.length === 1) {
+    return repositories[0]
   }
 
-  // If no repository found or source_control not provided, use first repository
-  if (!repository) {
-    repository = repositories[0]
-    if (!repository) {
-      vscode.window.showErrorMessage(
-        dictionary.error_message.REPOSITORY_NOT_FOUND
-      )
-      return null
+  const repositories_with_changes = repositories.filter(
+    (repo) =>
+      repo.state.indexChanges.length > 0 ||
+      repo.state.workingTreeChanges.length > 0
+  )
+
+  const repositories_to_show =
+    repositories_with_changes.length > 0
+      ? repositories_with_changes
+      : repositories
+
+  if (repositories_to_show.length === 1) {
+    return repositories_to_show[0]
+  }
+
+  const picks = repositories_to_show.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: 'Select a repository to generate the commit message for'
+  })
+
+  if (!selected) {
+    return null
   }
 
-  return repository
+  return selected.repository
 }
 
 export async function prepare_staged_changes(

packages/vscode/src/views/panel/backend/message-handlers/handle-commit-changes/handle-commit-changes.ts

@@ -11,6 +11,33 @@ import * as path from 'path'
 import { execSync } from 'child_process'
 import { handle_accept_commit_message } from '../handle-accept-commit-message'
 
+function unstage_changes(repository: GitRepository) {
+  let has_commits = false
+  try {
+    execSync('git rev-parse HEAD', {
+      cwd: repository.rootUri.fsPath,
+      stdio: 'ignore'
+    })
+    has_commits = true
+  } catch (e) {
+    has_commits = false
+  }
+
+  try {
+    if (has_commits) {
+      execSync('git reset', { cwd: repository.rootUri.fsPath })
+    } else {
+      execSync('git rm --cached -r .', { cwd: repository.rootUri.fsPath })
+    }
+  } catch (error) {
+    Logger.error({
+      function_name: 'unstage_changes',
+      message: 'Failed to unstage changes',
+      data: error
+    })
+  }
+}
+
 async function proceed_with_commit_generation(
   panel_provider: PanelProvider,
   repository: GitRepository,
@@ -20,7 +47,7 @@ async function proceed_with_commit_generation(
     const api_config = await get_commit_message_config(panel_provider.context)
     if (!api_config) {
       if (was_empty_stage) {
-        await vscode.commands.executeCommand('git.unstageAll')
+        unstage_changes(repository)
       }
       panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
       return
@@ -35,7 +62,7 @@ async function proceed_with_commit_generation(
         dictionary.information_message.NO_CHANGES_TO_COMMIT
       )
       if (was_empty_stage) {
-        await vscode.commands.executeCommand('git.unstageAll')
+        unstage_changes(repository)
       }
       panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
       return
@@ -55,7 +82,7 @@ async function proceed_with_commit_generation(
 
     if (!commit_message) {
       if (panel_provider.commit_was_staged_by_script) {
-        await vscode.commands.executeCommand('git.unstageAll')
+        unstage_changes(repository)
       }
       panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
       panel_provider.commit_was_staged_by_script = false
@@ -79,7 +106,7 @@ async function proceed_with_commit_generation(
     }
   } catch (error) {
     if (panel_provider.commit_was_staged_by_script) {
-      await vscode.commands.executeCommand('git.unstageAll')
+      unstage_changes(repository)
     }
     panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
     panel_provider.commit_was_staged_by_script = false
@@ -99,12 +126,14 @@ export const handle_commit_changes = async (
 ): Promise<void> => {
   await vscode.workspace.saveAll()
 
-  const repository = get_git_repository()
+  const repository = await get_git_repository()
   if (!repository) {
     panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
     return
   }
 
+  ;(panel_provider as any)._selected_repository = repository
+
   await repository.status()
 
   panel_provider.commit_was_staged_by_script = false
@@ -138,12 +167,15 @@ export const handle_proceed_with_commit = async (
   panel_provider: PanelProvider,
   files_to_stage: string[]
 ): Promise<void> => {
-  const repository = get_git_repository()
+  const repository: GitRepository | undefined = (panel_provider as any)
+    ._selected_repository
   if (!repository) {
+    vscode.window.showErrorMessage(
+      'No repository selected for committing changes.'
+    )
     panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
     return
   }
-
   if (files_to_stage.length === 0) {
     panel_provider.send_message({ command: 'COMMIT_PROCESS_CANCELLED' })
     return