feat: 支持3-way-merge 解决冲突

Author: guqiankun.gqk

package.json

@@ -99,7 +99,7 @@
     {
       "publisher": "cloud-ide-ext",
       "name": "web-scm",
-      "version": "0.1.3"
+      "version": "0.1.10"
     },
     {
       "publisher": "alex-ext-public",

packages/code-api/src/antcode/antcode.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Autowired } from '@opensumi/di';
 import { localize, IReporterService, MessageType, LRUCache } from '@opensumi/ide-core-common';
 import { REPORT_NAME } from '@alipay/alex-core';
-import { request, RequestOptions, isResponseError } from '@alipay/alex-shared';
+import { request, RequestOptions, isResponseError, createUrl } from '@alipay/alex-shared';
 import { API } from './types';
 import { Branch, FileAction, FileActionHeader, FileActionResult, Project } from '../common/types';
 import {
@@ -461,4 +461,41 @@ export class AntCodeAPIService implements ICodeAPIService {
       )}/merge/conflicts?source_branch=${sourceBranch}&target_branch=${targetBranch}`
     );
   }
+
+  /*
+   * 获取两个分支 的共同祖先
+   * 类似于 git merge-base branch1 branch2
+   * 接口暂时只支持查询两个分支
+   */
+  async mergeBase(
+    repo: IRepositoryModel,
+    target: string,
+    source: string
+  ): Promise<API.ResponseCommit> {
+    let url = `/api/v4/projects/${this.getProjectId(
+      repo
+    )}/repository/merge_base?refs[]=${target}&refs[]=${source}`;
+    if (this.config.endpoint) {
+      url = createUrl(this.config.endpoint, url);
+    }
+    const urlInstance = new URL(url, location.origin);
+    const privateToken = this.PRIVATE_TOKEN;
+    return (
+      await fetch(urlInstance.toString(), {
+        method: 'GET',
+        ...(privateToken
+          ? {
+              headers: {
+                'PRIVATE-TOKEN': privateToken,
+                'Content-Type': 'application/json',
+              },
+            }
+          : {
+              headers: {
+                'Content-Type': 'application/json',
+              },
+            }),
+      })
+    ).json();
+  }
 }

packages/code-api/src/common/types.ts

@@ -368,6 +368,12 @@ export interface ICodeAPIService {
     sourceBranch: string,
     targetBranch: string
   ): Promise<AntCodeAPI.ConflictResponse>;
+
+  mergeBase(
+    repo: IRepositoryModel,
+    target: string,
+    source: string
+  ): Promise<AntCodeAPI.ResponseCommit>;
 }
 
 export interface ICodeAPIServiceProvider extends ICodeAPIService {

packages/code-api/src/github/github.service.ts

@@ -69,6 +69,13 @@ export class GitHubAPIService implements ICodeAPIService {
   constructor() {
     this._OAUTH_TOKEN = this.config.token || this.helper.GITHUB_TOKEN;
   }
+  mergeBase(
+    repo: IRepositoryModel,
+    target: string,
+    source: string
+  ): Promise<ConflictAPI.ResponseCommit> {
+    throw new Error('Method not implemented.');
+  }
   getEntryInfo?(repo: IRepositoryModel, entry: EntryParam): Promise<EntryInfo> {
     throw new Error('Method not implemented.');
   }

packages/code-api/src/gitlab/gitlab.service.ts

@@ -66,6 +66,13 @@ export class GitLabAPIService implements ICodeAPIService {
   constructor() {
     this._PRIVATE_TOKEN = this.config.token || this.helper.GITLAB_TOKEN;
   }
+  mergeBase(
+    repo: IRepositoryModel,
+    target: string,
+    source: string
+  ): Promise<ConflictAPI.ResponseCommit> {
+    throw new Error('Method not implemented.');
+  }
   getEntryInfo?(repo: IRepositoryModel, entry: EntryParam): Promise<EntryInfo> {
     throw new Error('Method not implemented.');
   }

packages/code-api/src/gitlink/gitlink.service.ts

@@ -61,6 +61,13 @@ export class GitLinkAPIService implements ICodeAPIService {
   constructor() {
     this._PRIVATE_TOKEN = this.config.token || '';
   }
+  mergeBase(
+    repo: IRepositoryModel,
+    target: string,
+    source: string
+  ): Promise<ConflictAPI.ResponseCommit> {
+    throw new Error('Method not implemented.');
+  }
   getEntryInfo?(repo: IRepositoryModel, entry: EntryParam): Promise<EntryInfo> {
     throw new Error('Method not implemented.');
   }

packages/code-service/src/commands.contribution.ts

@@ -126,6 +126,10 @@ namespace CODE_SERVICE_COMMANDS {
     id: 'code-service.getConflict',
     category: CATEGORY,
   };
+  export const MERGEBASE: Command = {
+    id: 'code-service.mergeBase',
+    category: CATEGORY,
+  };
 }
 
 export enum RemoteResourceType {
@@ -192,6 +196,7 @@ export class CommandsContribution extends Disposable implements CommandContribut
       CODE_SERVICE_COMMANDS.GETFILES,
       CODE_SERVICE_COMMANDS.GETUSER,
       CODE_SERVICE_COMMANDS.SCMREFRESH,
+      CODE_SERVICE_COMMANDS.MERGEBASE,
       // CODE_SERVICE_COMMANDS.CREATEBRANCHFROM,
 
       // conflict
@@ -403,6 +408,12 @@ export class CommandsContribution extends Disposable implements CommandContribut
     return repo.request.createBranch(newBranchName, ref);
   }
 
+  async mergeBase(repoPath: string, target: string, source: string) {
+    const repo = this.codeModel.getRepository(repoPath);
+    if (!repo) throw new Error('conflict request Error createNewBranch');
+    return repo.request.mergeBase(target, source);
+  }
+
   // TODO: 暂时只支持根仓库的切换，submodules 切换会引起文件变更
   async checkoutBranch(repoPath: string, branchName: string) {
     const { rootRepository } = this.codeModel;

packages/integrations/src/startup/web-scm.plugin.ts

@@ -70,7 +70,11 @@ export const activate = ({ commands }: IPluginAPI) => {
   });
 
   commands.registerCommand('web-scm.windowOpen', async (path) => {
-    window.open(path);
+    if (!path) {
+      window.location = window.location;
+    } else {
+      window.open(path);
+    }
   });
 
   /*
@@ -92,11 +96,11 @@ export const activate = ({ commands }: IPluginAPI) => {
     // 测试解决冲突内容
     return {
       isMergeConflicts: false,
-      // sourceBranch: "merge2",
-      // targetBranch: "merge1",
-      // prId: "146007520",
-      // hasTag: false,
-      // from: 0
+      sourceBranch: 'merge4',
+      targetBranch: 'merge1',
+      prId: '146206608',
+      hasTag: false,
+      from: 0,
     };
   });
 };