fix: diff file

Author: zhangmo8

src/git/index.ts

@@ -65,8 +65,9 @@ export class GitService {
 
   async getParentCommit(commitHash: string): Promise<string | null> {
     try {
-      const result = await this.git.raw(['rev-parse', `${commitHash}^`])
-      return result.trim()
+      const result = await this.git.raw(['rev-list', '--parents', '-n', '1', commitHash])
+      const [, parentHash] = result.trim().split(' ')
+      return parentHash || null
     }
     catch (error) {
       console.error('Failed to get parent commit:', error)

src/index.ts

@@ -42,30 +42,37 @@ export function activate(context: vscode.ExtensionContext) {
 
       // For modified files, show diff between current commit and its parent
       if (fileInfo.status === 'M') {
-        const parentCommit = await gitService.getParentCommit(commit)
-        if (parentCommit) {
-          const leftUri = toGitUri(uri, parentCommit, fileInfo)
-          const rightUri = toGitUri(uri, commit, fileInfo)
-          await vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title)
+        try {
+          const parentCommit = await gitService.getParentCommit(commit)
+          if (parentCommit) {
+            const leftUri = toGitUri(uri, parentCommit)
+            const rightUri = toGitUri(uri, commit)
+            await vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title)
+            return
+          }
+        }
+        catch (error) {
+          vscode.window.showErrorMessage(`无法获取父提交: ${error}`)
           return
         }
       }
 
       // For added files, show the entire file content
       if (fileInfo.status === 'A') {
-        const gitUri = toGitUri(uri, commit, fileInfo)
+        const gitUri = toGitUri(uri, commit)
         await vscode.commands.executeCommand('vscode.open', gitUri)
       }
     }),
   )
 }
 
 // Helper function to create Git URIs
-function toGitUri(uri: vscode.Uri, ref: string, fileInfo: { path: string }): vscode.Uri {
+function toGitUri(uri: vscode.Uri, ref: string): vscode.Uri {
   return uri.with({
     scheme: 'git',
+    path: uri.path,
     query: JSON.stringify({
-      path: fileInfo.path,
+      path: uri.path,
       ref,
     }),
   })